1. 20c7e3d Show usage string for 'git merge-ours -h' by Jonathan Nieder · 15 years ago
  2. a00a42a git-merge-ours: make it a builtin. by Thomas Harning · 17 years ago