Commit Graph

16 Commits (master)

Author SHA1 Message Date
Elijah Newren 35f6967161 ll-merge: make callers responsible for showing warnings 8 months ago
Heba Waly d3d7172e40 merge: move doc to ll-merge.h 3 years ago
brian m. carlson 2c65d90f75 am: reload .gitattributes after patching it 3 years ago
Elijah Newren b2a7942b8b merge-recursive: increase marker length with depth of recursion 4 years ago
Nguyễn Thái Ngọc Duy 32eaa46883 ll-merge.c: remove implicit dependency on the_index 4 years ago
Elijah Newren ef3ca95475 Add missing includes and forward declarations 4 years ago
Justin Frankel 58a1ece478 merge-recursive --patience 12 years ago
Jonathan Nieder 712516bcac ll-merge: replace flag argument with options struct 12 years ago
Jonathan Nieder 18b037a5b6 ll-merge: let caller decide whether to renormalize 12 years ago
Jonathan Nieder 73cf7f713d ll-merge: make flag easier to populate 12 years ago
Jonathan Nieder f01de62e45 ll_merge(): add ancestor label parameter for diff3-style output 13 years ago
Avery Pennarun 8cc5b29065 git merge -X<option> 13 years ago
Junio C Hamano 8588567c96 rerere: honor conflict-marker-size attribute 13 years ago
Junio C Hamano 525ab63950 merge-recursive: split low-level merge functions out. 15 years ago