Add a new merge strategy by Fredrik Kuivinen.
[gitweb.git] / git-sh-setup.sh
2005-09-08 Big tool rename.