| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 |
| * | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 |
| * | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 |
| * | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 |
| * | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 |
| * | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 | 1 | -1/+1 |
| * | t6026-merge-attr: clean up background process at end of test casejs/t6026-clean-up | Johannes Sixt | 2016-09-07 | 1 | -0/+2 |
| * | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfile | Ben Wijen | 2016-08-23 | 1 | -1/+1 |
| * | t6026-merge-attr: child processes must not inherit index.lock handles | Ben Wijen | 2016-08-18 | 1 | -0/+13 |
| * | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 1 | -1/+2 |
| * | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 1 | -5/+9 |
| |\ |
|
| | * | ll-merge: pass the original path to external driversjc/ll-merge-expose-path | Junio C Hamano | 2015-06-04 | 1 | -5/+9 |
| * | | t: fix some trivial cases of ignored exit codes in loops | Jeff King | 2015-03-25 | 1 | -3/+3 |
| |/ |
|
| * | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 | 1 | -0/+12 |
| * | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+22 |
| |\ |
|
| | * | builtin-merge: release the lockfile in try_merge_strategy() | Miklos Vajna | 2008-09-06 | 1 | -0/+22 |
| * | | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 2008-09-03 | 1 | -6/+6 |
| |/ |
|
| * | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 2007-04-18 | 1 | -2/+6 |
| * | Custom low-level merge driver support. | Junio C Hamano | 2007-04-18 | 1 | -1/+70 |
| * | Add a demonstration/test of customized merge. | Junio C Hamano | 2007-04-17 | 1 | -0/+72 |
