summaryrefslogtreecommitdiff
path: root/ll-merge.h
AgeCommit message (Expand)Author
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano
2008-02-18merge-recursive: split low-level merge functions out.Junio C Hamano