summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
AgeCommit message (Expand)AuthorFilesLines
2016-11-10t6026: ensure that long-running script really isLibravatar Johannes Schindelin1-4/+4
2016-11-10Revert "t6026-merge-attr: don't fail if sleep exits early"Libravatar Junio C Hamano1-1/+1
2016-11-10Revert "t6026-merge-attr: ensure that the merge driver was called"Libravatar Junio C Hamano1-2/+1
2016-11-10t6026-merge-attr: ensure that the merge driver was calledLibravatar Andreas Schwab1-1/+2
2016-11-08t6026-merge-attr: don't fail if sleep exits earlyLibravatar Andreas Schwab1-1/+1
2016-09-07t6026-merge-attr: clean up background process at end of test caseLibravatar Johannes Sixt1-0/+2
2016-08-23mingw: ensure temporary file handles are not inherited by child processesLibravatar Ben Wijen1-1/+1
2016-08-18t6026-merge-attr: child processes must not inherit index.lock handlesLibravatar Ben Wijen1-0/+13
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-1/+2
2015-06-24Merge branch 'jc/ll-merge-expose-path'Libravatar Junio C Hamano1-5/+9
2015-06-04ll-merge: pass the original path to external driversLibravatar Junio C Hamano1-5/+9
2015-03-25t: fix some trivial cases of ignored exit codes in loopsLibravatar Jeff King1-3/+3
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano1-0/+12
2008-09-25Merge branch 'mv/merge-recursive'Libravatar Shawn O. Pearce1-0/+22
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Libravatar Miklos Vajna1-0/+22
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Libravatar Nanako Shiraishi1-6/+6
2007-04-18Custom low-level merge driver: change the configuration scheme.Libravatar Junio C Hamano1-2/+6
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano1-1/+70
2007-04-17Add a demonstration/test of customized merge.Libravatar Junio C Hamano1-0/+72
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 19:02:43 +0000