Merge branch 'bg/apply-blank-trailing-context' into maint
[gitweb.git] / contrib / examples / git-merge-ours.sh
2007-11-22 git-merge-ours: make it a builtin.