projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cc58d7d) | patch
rerere: understand "diff3 -m" style conflicts with the original
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 17:24:45 +0000 (10:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:41:43 +0000 (19:41 -0700)
commit387c9d49815ef4b1cefda71cf27f199d9fb24083
treea3ff97314c0acbc7776ee4264a9d05bf3d820f9ftree | snapshot
parentcc58d7dfddc842360f6aade1507e1063d8cd0f40commit | diff
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>
rerere.c diff | blob | history
Git—the stupid content tracker