Merge branch 'master'
[gitweb.git] / git-merge-ours.sh
2005-11-07 GIT 0.99.9e v0.99.9e
2005-11-03 GIT 0.99.9c v0.99.9c
2005-11-03 git-merge-ours: make sure our index matches HEAD
2005-11-03 Add 'ours' merge strategy.