Add a new merge strategy by Fredrik Kuivinen.
[git] / gitMergeCommon.py
2005-09-11  Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.