Prepare 0.99.7 release candidate branch.
[gitweb.git] / gitMergeCommon.py
2005-09-11 Add a new merge strategy by Fredrik Kuivinen.