Split "git-pull-script" into two parts
[git] / git-resolve-script
2005-05-05  Linus TorvaldsSplit "git-pull-script" into two parts