Age | Commit message (Expand) | Author |
---|---|---|
2010-01-21 | Merge branch 'jc/conflict-marker-size' | Junio C Hamano |
2010-01-18 | git merge -X<option> | Avery Pennarun |
2010-01-17 | rerere: honor conflict-marker-size attribute | Junio C Hamano |
2008-02-18 | merge-recursive: split low-level merge functions out. | Junio C Hamano |