]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4ab9a15) | patch
handle_delete_modify(): Check whether D/F conflicts are still present
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:08 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:05 +0000 (17:37 -0700)
commit84a08a47b9559e76df96645c536845f31ba4dc7b
treea8e060859a43ef7dd6d600a96101138d7a6224f2tree | snapshot
parent4ab9a157d06956ce5a1060a28404cbade3039fa2commit | diff
handle_delete_modify(): Check whether D/F conflicts are still present

If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.

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/t6020-merge-df.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.