summaryrefslogtreecommitdiff
path: root/t/t5100/info0004
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-14 19:40:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-15 02:39:57 -0800
commitc5ab03f26c992e30f355fba129f70db0f290fcd7 (patch)
tree799ffb275675e682cc9b4375eddd7c0e70139187 /t/t5100/info0004
parentmodify/delete conflict resolution overwrites untracked file (diff)
downloadtgif-c5ab03f26c992e30f355fba129f70db0f290fcd7.tar.xz
merge-recursive: do not clobber untracked working tree garbage
When merge-recursive wanted to create a new file in the work tree (either as the final result, or a hint for reference purposes while delete/modify conflicts), it unconditionally overwrote an untracked file in the working tree. Be careful not to lose whatever the user has that is not tracked. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/info0004')
0 files changed, 0 insertions, 0 deletions