Merge branch 'fixes'
[git.git] / git-merge-stupid.sh
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.