git-branch: Mention -d and -D in man-page.
[gitweb.git] / git-merge-ours.sh
2005-11-03 git-merge-ours: make sure our index matches HEAD
2005-11-03 Add 'ours' merge strategy.