Merge http://www.kernel.org/pub/scm/gitk/gitk
[gitweb.git] / git-merge-ours.sh
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-03 git-merge-ours: make sure our index matches HEAD
2005-11-03 Add 'ours' merge strategy.