summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorOlivier Marin <dkr@freesurf.fr>2008-07-07 12:42:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-10 07:17:46 (GMT)
commit99d698f1e703754422f1dd780487ddbff3726dc3 (patch)
tree1524e03e8e58318658e8fdf47c31c667d5bd29c6 /git-gui/lib/merge.tcl
parenta9a3e82e6d0018ff42ec11fd9560c1ff47add824 (diff)
downloadgit-99d698f1e703754422f1dd780487ddbff3726dc3.zip
git-99d698f1e703754422f1dd780487ddbff3726dc3.tar.gz
git-99d698f1e703754422f1dd780487ddbff3726dc3.tar.bz2
builtin-rerere: more carefully find conflict markers
When a conflicting file contains a line that begin with "=======", rerere failed to parse conflict markers. This result to a wrong preimage file and an unexpected error for the user. The boundary between ours and theirs not just begin with 7 equals, but is followed by either a SP or a LF. This patch enforces parsing rules so that markers match in the right order, and when ambiguous, the command does not autoresolve the conflicted file. Especially because we are introducing rerere.autoupdate configuration (which is off by default for safety) that automatically stages the resolution made by rerere, it is necessary to make sure that we do not autoresolve when there is any ambiguity. Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions