summaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-0/+2
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-171-0/+2
* | git merge -X<option>Avery Pennarun2010-01-171-1/+1
|/
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-181-0/+15