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 /git-gui/lib/merge.tcl | |
| parent | 480d3d6bf90a6ec5b8f02d672f1d4027a4889106 (diff) | |
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 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions