Merge branch 'fixes'
[git.git] / git-resolve.sh
2005-09-08 Junio C HamanoBig tool rename.