git-apply: do not fail on binary diff when not applying nor checking.
[git.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.