diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:24:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:43 -0700 |
| commit | 387c9d49815ef4b1cefda71cf27f199d9fb24083 (patch) | |
| tree | a3ff97314c0acbc7776ee4264a9d05bf3d820f9f /builtin-merge-file.c | |
| parent | cc58d7dfddc842360f6aade1507e1063d8cd0f40 (diff) | |
| download | git-387c9d49815ef4b1cefda71cf27f199d9fb24083.tar.gz | |
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 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions