summaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive --patienceJustin Frankel2010-08-261-0/+1
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-15/+6
* ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+1
* ll-merge: make flag easier to populateJonathan Nieder2010-08-061-0/+14
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
* 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