summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
AgeCommit message (Expand)AuthorFilesLines
2010-12-14use persistent memory for rejected pathsLibravatar Clemens Buchacher1-3/+16
2010-12-14do not overwrite files in leading pathLibravatar Clemens Buchacher1-1/+1
2010-12-14t7607: add leading-path testsLibravatar Clemens Buchacher1-0/+51
2010-12-14t7607: use test-lib functions and check MERGE_HEADLibravatar Clemens Buchacher1-23/+15
2010-12-02Merge branch 'cb/maint-orphan-merge-noclobber' into maintLibravatar Junio C Hamano1-0/+16
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-0/+16
2010-07-20Convert "! git" to "test_must_fail git"Libravatar Jared Hance1-6/+6
2008-12-15merge-recursive: do not clobber untracked working tree garbageLibravatar Junio C Hamano1-1/+1
2008-12-15modify/delete conflict resolution overwrites untracked fileLibravatar Clemens Buchacher1-0/+87