summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
Commit message (Expand)AuthorAgeFilesLines
* Convert "! git" to "test_must_fail git"Jared Hance2010-07-201-6/+6
* merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-151-1/+1
* modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-151-0/+87