Commit message (Expand) | Author | Age | |
---|---|---|---|
* | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 |
* | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 |
|\ | |||
| * | ll-merge: pass the original path to external drivers | Junio C Hamano | 2015-06-04 |
* | | t: fix some trivial cases of ignored exit codes in loops | Jeff King | 2015-03-25 |
|/ | |||
* | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 |
* | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 |
|\ | |||
| * | builtin-merge: release the lockfile in try_merge_strategy() | Miklos Vajna | 2008-09-06 |
* | | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 2008-09-03 |
|/ | |||
* | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 2007-04-18 |
* | Custom low-level merge driver support. | Junio C Hamano | 2007-04-18 |
* | Add a demonstration/test of customized merge. | Junio C Hamano | 2007-04-17 |