Age | Commit message (Expand) | Author | Files | Lines |
2010-01-20 | conflict-marker-size: add test and docs | Junio C Hamano | 1 | -0/+12 |
2008-09-25 | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 1 | -0/+22 |
2008-09-06 | builtin-merge: release the lockfile in try_merge_strategy() | Miklos Vajna | 1 | -0/+22 |
2008-09-03 | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 1 | -6/+6 |
2007-04-18 | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 1 | -2/+6 |
2007-04-18 | Custom low-level merge driver support. | Junio C Hamano | 1 | -1/+70 |
2007-04-17 | Add a demonstration/test of customized merge. | Junio C Hamano | 1 | -0/+72 |