summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
AgeCommit message (Expand)Author
2010-07-20Convert "! git" to "test_must_fail git"Jared Hance
2008-12-15merge-recursive: do not clobber untracked working tree garbageJunio C Hamano
2008-12-15modify/delete conflict resolution overwrites untracked fileClemens Buchacher