| commit | 7b3d3b06811c3d603d47d50eb3c8775571845a80 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:52:01 +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 | fc58e4f6e20da1265d3656935fc3487e8ee70a0c | treesnapshot (tar.gz zip) |
| parent | 3b9616f149e46e1a97bf6dd5bc727a663d92dded | commitdiff |
merge-recursive: avoid clobbering untracked files with directory renames
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 |