| commit | e03acb8bc1f03827210235dd72578b8b26f19c51 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:20 +0000 (11 23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:39 +0000 (14 14:19 -0700) | ||
| tree | fad3ab9d30a872700493276f20c894749191253f | treesnapshot (tar.gz zip) |
| parent | b70332520d2ba0f32b5006feff86d71242061011 | commitdiff |
merge-recursive: Have conflict_rename_delete reuse modify/delete code
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |