Merge branch 'maint' to sync with 1.5.2.5
[gitweb.git] / contrib / examples / git-resolve.sh
2007-02-13 Remove git-resolve.