Merge branch 'cb/assume-unchanged-fix'
[gitweb.git] / contrib / examples / git-merge-ours.sh
2007-11-23 Merge branch 'maint'
2007-11-22 git-merge-ours: make it a builtin.