merge-recursive: fix overwriting dirty files involved in renames
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:12 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit64b1abe...62b44e6bad84b980e8ea2811302e71c7
tree9ad6dc0...aca8ad87bd6612e82feaf6fb1fe379e1copy hash to clipboard (tree)
parent79c4759...f5c8c0008ae9281f20c2a041d4cabd93copy hash to clipboard (diff)
merge-recursive.c
merge-recursive.h
t/t3501-revert-cherry-pick.sh
t/t6043-merge-rename-directories.sh
t/t7607-merge-overwrite.sh
unpack-trees.c
unpack-trees.h