Google Git
Sign in
googlers / jrn / git / c8556c6213cf6dca63f29f98ad9d074f6c5f8233 / ll-merge.h
  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 · 15 years ago
  6. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  7. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  8. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 15 years ago
  9. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 17 years ago