]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 71f7ffc) | patch
conflict_rename_delete(): Check whether D/F conflicts are still present
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:05 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commita0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d
treef8f06b2f4d13cbb721a17892ee543d5b6265bdb7tree | snapshot
parent71f7ffcc02a2f38436c59146b86897389130a538commit | diff
conflict_rename_delete(): 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/t6022-merge-rename.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.