path: root/t/
AgeCommit message (Expand)Author
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-01-19Tighten and correct a few testcases for merging and cherry-pickingElijah Newren
2016-07-13Merge branch 'ah/unpack-trees-advice-messages'Junio C Hamano
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie
2016-06-17tests: unpack-trees: update to use test_i18n* functionsVasco Almeida
2013-06-07tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Johannes Sixt
2012-04-16merge overwrites unstaged changes in renamed fileClemens Buchacher
2011-09-21unpack-trees: print "Aborting" to stderrMichael J Gruber
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano
2011-04-02Merge branch 'ab/i18n-st'Junio C Hamano
2011-03-25merge: merge unborn index before setting refJeff King
2011-03-25t7607: clean up stray untracked fileJeff King
2011-03-25t7607: mark known breakage in test 11 as fixedJeff King
2011-03-10i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason
2011-02-10Merge branch 'tr/merge-unborn-clobber'Junio C Hamano
2010-11-30Merge branch 'cb/leading-path-removal'Junio C Hamano
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano
2010-11-15use persistent memory for rejected pathsClemens Buchacher
2010-11-15do not overwrite untracked during merge from unborn branchClemens Buchacher
2010-10-13do not overwrite files in leading pathClemens Buchacher
2010-10-13t7607: add leading-path testsClemens Buchacher
2010-10-13t7607: use test-lib functions and check MERGE_HEADClemens Buchacher
2010-08-25Exhibit merge bug that clobbers index&WTThomas Rast
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