diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-09-27 16:33:45 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-27 13:38:37 -0700 |
| commit | 1fdd51aa13c27403c37b57ead32ef79b81d8128b (patch) | |
| tree | aa2959d443ab6329fb8f0901be3bd2f5848d7b83 /t/lib-diff | |
| parent | Change unpack_trees' 'reset' flag into an enum (diff) | |
| download | tgif-1fdd51aa13c27403c37b57ead32ef79b81d8128b.tar.xz | |
unpack-trees: avoid nuking untracked dir in way of unmerged file
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-diff')
0 files changed, 0 insertions, 0 deletions