Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |