projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 411b5eb) | patch
Reintegrate: only detect conflict markers in conflicted files
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 17:19:54 +0000 (10:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 17:19:54 +0000 (10:19 -0700)
commit6e916ab43913c1703eca314d15016761b5285616
tree80beb1b990bfc5673d067640cfbcbe1181573cf8tree | snapshot
parent411b5ebe488162e45606a10b7371c75e6e55e443commit | diff
Reintegrate: only detect conflict markers in conflicted files

Otherwise we would misidentify new sections in documentation set
marked with ======= as conflict markers.
Reintegrate diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.