Add a new merge strategy by Fredrik Kuivinen.
[git] / fetch.c
2005-09-08  Junio C HamanoBig tool rename.