Log - 1767c51787f2a9aaf99716a48e8928618c1c9481 - jrn/git

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