| commit | 79c47598f5c8c0008ae9281f20c2a041d4cabd93 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 19 Apr 2018 17:58:11 +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 | 889171881bb406243998cde584decd73fea00721 | treesnapshot (tar.gz zip) |
| parent | 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 | 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 |