Google Git
Sign in
googlers / jrn / git / cfa97ae141160486dbe8a786487bcaa965a160f0 / git-merge-stupid.sh
  1. 7d3c82a Fixing comment in merge strategies by Tom Clarke · 18 years ago
  2. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  3. 2276aa6 Use Daniel's read-tree in the merge strategy 'resolve'. by Junio C Hamano · 20 years ago