git-core-foo -> git-foo, except the core package
[git] / git-merge-ours.sh
2005-11-03  Junio C Hamanogit-merge-ours: make sure our index matches HEAD
2005-11-03  Junio C HamanoAdd 'ours' merge strategy.