summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
Commit message (Expand)AuthorAgeFilesLines
* t602[1236], t6034: modernize test formattingElijah Newren2020-02-271-23/+23
* t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleepJohannes Sixt2016-11-111-1/+9
* t6026: ensure that long-running script really isJohannes Schindelin2016-11-101-4/+4
* Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano2016-11-101-1/+1
* Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano2016-11-101-2/+1
* t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab2016-11-101-1/+2
* t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab2016-11-081-1/+1
* t6026-merge-attr: clean up background process at end of test casejs/t6026-clean-upJohannes Sixt2016-09-071-0/+2
* mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-231-1/+1
* t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
* merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-1/+2
* Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-241-5/+9
|\
| * ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-041-5/+9
* | t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-251-3/+3
|/
* conflict-marker-size: add test and docsJunio C Hamano2010-01-201-0/+12
* Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-251-0/+22
|\
| * builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-061-0/+22
* | tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-031-6/+6
|/
* Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-181-2/+6
* Custom low-level merge driver support.Junio C Hamano2007-04-181-1/+70
* Add a demonstration/test of customized merge.Junio C Hamano2007-04-171-0/+72
View Lorry Controller Status