modify/delete conflict resolution overwrites untracked file
authorClemens Buchacher <drizzd@aon.at>
Wed, 10 Dec 2008 20:12:59 +0000 (21:12 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Dec 2008 10:39:57 +0000 (02:39 -0800)
commit7bb1fcc...fcc5a2d0164f243fd10f346eb0822ddf
tree12f184e...e7e088f38418941c6469ad57b90e01eecopy hash to clipboard (tree)
parent544ddb0...5a4bd49da9ffc1d9da80bdc0d71b2518copy hash to clipboard (diff)
t/t7607-merge-overwrite.sh [new file with mode: 0755]