Google Git
Sign in
googlers / jrn / git / bf9a05ba46a9d464424d22482aaa54abdd28b77d / t / t6037-merge-ours-theirs.sh
  1. 155a4b7 attr: "binary" attribute should choose built-in "binary" merge driver by Junio C Hamano · 13 years ago
  2. a944af1 merge: teach -Xours/-Xtheirs to binary ll-merge driver by Junio C Hamano · 13 years ago
  3. ce14e0b Convert "! git" to "test_must_fail git" by Jared Hance · 15 years ago
  4. ee2c795 Teach git-pull to pass -X<option> to git-merge by Avery Pennarun · 15 years ago
  5. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago