Git 2.1.1

1. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
2. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
3. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
4. 73cf7f7 ll-merge: make flag easier to populate by Jonathan Nieder · 15 years ago
5. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 16 years ago
6. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 16 years ago
7. 8cc5b29 git merge -X<option> by Avery Pennarun · 16 years ago
8. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 16 years ago
9. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 18 years ago