merge-recursive: fix overwriting dirty files involved in renames
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:02 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commite0052f4...13cd8f586b0b9975fedffce268ca6ce9
tree22e8c50...49c9850239e195cb4ae5a877f8bd0bd1copy hash to clipboard (tree)
parent7b3d3b0...811c3d603d47d50eb3c8775571845a80copy 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