path: root/t/
AgeCommit message (Expand)Author
2020-02-27t602[1236], t6034: modernize test formattingElijah Newren
2016-11-11t6026: clarify the point of "kill $(cat"Johannes Sixt
2016-11-10t6026: ensure that long-running script really isJohannes Schindelin
2016-11-10Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano
2016-11-10Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano
2016-11-10t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab
2016-11-08t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab
2016-09-07t6026-merge-attr: clean up background process at end of test caseJohannes Sixt
2016-08-23mingw: ensure temporary file handles are not inherited by child processesBen Wijen
2016-08-18t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano
2015-03-25t: fix some trivial cases of ignored exit codes in loopsJeff King
2010-01-21conflict-marker-size: add test and docsJunio C Hamano
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-07builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi
2007-04-18Custom low-level merge driver: change the configuration scheme.Junio C Hamano
2007-04-18Custom low-level merge driver support.Junio C Hamano
2007-04-17Add a demonstration/test of customized merge.Junio C Hamano