summaryrefslogtreecommitdiff
path: root/ll-merge.h
AgeCommit message (Expand)AuthorFilesLines
2019-11-18merge: move doc to ll-merge.hLibravatar Heba Waly1-1/+72
2019-09-03am: reload .gitattributes after patching itLibravatar brian m. carlson1-0/+1
2019-01-04Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano1-0/+1
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren1-0/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+4
2018-08-15Add missing includes and forward declarationsLibravatar Elijah Newren1-0/+2
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-15/+6
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-0/+1
2010-08-06ll-merge: make flag easier to populateLibravatar Jonathan Nieder1-0/+14
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 11:23:56 +0000