diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 20:58:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 10:11:00 +0300 |
| commit | 79c47598f5c8c0008ae9281f20c2a041d4cabd93 (patch) | |
| tree | 889171881bb406243998cde584decd73fea00721 /merge-recursive.h | |
| parent | 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 (diff) | |
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>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions