![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:19 +0000 (23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700) | ||
| commit | b70332520d2ba0f32b5006feff86d71242061011 | |
| tree | c331312b75e4770bdb6180d762417518d59060b3 | tree | snapshot |
| parent | 434b8525e7a68893106f6360ff0a261f03c37512 | commit | diff |
merge-recursive: Make modify/delete handling code reusable
modify/delete and rename/delete share a lot of similarities; we'd like all
the criss-cross and D/F conflict handling specializations to be shared
between the two.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
modify/delete and rename/delete share a lot of similarities; we'd like all
the criss-cross and D/F conflict handling specializations to be shared
between the two.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diff | blob | history | |
| t/t6022-merge-rename.sh | diff | blob | history |