[PATCH] Really fix git-merge-one-file-script this time.
[git] / pull.c
2005-04-30  Daniel Barkalow[PATCH] Split out "pull" from particular methods