Three-way merge: fix silly bug that made trivial merges not work
[git] / git-fetch-script
2005-05-22  Linus TorvaldsSplit up git-pull-script into separate "fetch" and...