summaryrefslogtreecommitdiff
path: root/ll-merge.h
AgeCommit message (Expand)AuthorFilesLines
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-0/+2
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-1/+1
2010-01-17rerere: honor conflict-marker-size attributeLibravatar Junio C Hamano1-0/+2
2008-02-18merge-recursive: split low-level merge functions out.Libravatar Junio C Hamano1-0/+15