| commit | bbafab7f326146dc9a8bcf42071574dc22fbed5e | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:52:03 +0000 (14 10:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Feb 2018 22:11:58 +0000 (27 14:11 -0800) | ||
| tree | c8a87fce54e45b7e30db9c0028af009098cb6cf9 | treesnapshot (tar.gz zip) |
| parent | e0052f4613cd8f586b0b9975fedffce268ca6ce9 | 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 |