Add 'ours' merge strategy.
[git.git] / git-merge-ours.sh
2005-11-03 Junio C HamanoAdd 'ours' merge strategy.