summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-29 17:24:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-31 02:41:43 (GMT)
commit387c9d49815ef4b1cefda71cf27f199d9fb24083 (patch)
treea3ff97314c0acbc7776ee4264a9d05bf3d820f9f /xdiff-interface.c
parentcc58d7dfddc842360f6aade1507e1063d8cd0f40 (diff)
downloadgit-387c9d49815ef4b1cefda71cf27f199d9fb24083.zip
git-387c9d49815ef4b1cefda71cf27f199d9fb24083.tar.gz
git-387c9d49815ef4b1cefda71cf27f199d9fb24083.tar.bz2
rerere: understand "diff3 -m" style conflicts with the original
This teaches rerere to grok conflicts expressed in "diff3 -m" style output, where the version from the common ancestor is output after the first side, preceded by a "|||||||" line. The rerere database needs to keep only the versions from two sides, so the code parses the original copy and discards it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions