[PATCH] Be more like the 'resolve' strategy.
[gitweb.git] / gitMergeCommon.py
2005-09-12 [PATCH] Make the ProgramError class printable.
2005-09-12 [PATCH] Introduce a 'die' function.
2005-09-11 Add a new merge strategy by Fredrik Kuivinen.