]> git.ipfire.org Git - thirdparty/git.git/history - git-merge-stupid.sh
[PATCH] Make the test more shell generic and fix missing Solaris find option
[thirdparty/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'.