]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 434b852) | patch
merge-recursive: Make modify/delete handling code reusable
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:19 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commitb70332520d2ba0f32b5006feff86d71242061011
treec331312b75e4770bdb6180d762417518d59060b3tree | snapshot
parent434b8525e7a68893106f6360ff0a261f03c37512commit | 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>
merge-recursive.c diff | blob | blame | history
t/t6022-merge-rename.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.