aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAge
* ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
* ll-merge: make flag easier to populateJonathan Nieder2010-08-06
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-17
* | git merge -X<option>Avery Pennarun2010-01-17
|/
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18