| commit | 18797a3b10e4077473740b953651b0032828d0fb | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 19 Apr 2018 17:58:13 +0000 (19 10:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 May 2018 07:11:00 +0000 (8 16:11 +0900) | ||
| tree | f47ccb5234057e94b141fa106e0363d8ac8b6e1c | treesnapshot (tar.gz zip) |
| parent | 64b1abe962b44e6bad84b980e8ea2811302e71c7 | commitdiff |
merge-recursive: fix remaining directory rename + dirty overwrite cases
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory | |
| t/t6043-merge-rename-directories.sh | diffblobblamehistory |