Git 2.29

1. d3d7172 merge: move doc to ll-merge.h by Heba Waly · 6 years ago
2. 2c65d90 am: reload .gitattributes after patching it by brian m. carlson · 6 years ago
3. ac193e0 Merge branch 'en/merge-path-collision' by Junio C Hamano · 7 years ago
4. b2a7942 merge-recursive: increase marker length with depth of recursion by Elijah Newren · 7 years ago
5. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
6. ef3ca95 Add missing includes and forward declarations by Elijah Newren · 7 years ago
7. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
8. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
9. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
10. 73cf7f7 ll-merge: make flag easier to populate by Jonathan Nieder · 15 years ago
11. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 16 years ago
12. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 16 years ago
13. 8cc5b29 git merge -X<option> by Avery Pennarun · 16 years ago
14. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 16 years ago
15. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 18 years ago