path: root/ll-merge.h
AgeCommit message (Expand)Author
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2019-11-18merge: move doc to ll-merge.hHeba Waly
2019-09-03am: reload .gitattributes after patching itbrian m. carlson
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-15Add missing includes and forward declarationsElijah Newren
2010-08-26merge-recursive --patienceJustin Frankel
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder
2010-08-06ll-merge: make flag easier to populateJonathan Nieder
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