diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 21:52:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 01:11:58 +0300 |
| commit | 7b3d3b06811c3d603d47d50eb3c8775571845a80 (patch) | |
| tree | fc58e4f6e20da1265d3656935fc3487e8ee70a0c /unpack-trees.h | |
| parent | 3b9616f149e46e1a97bf6dd5bc727a663d92dded (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 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions