[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[git.git] / gitMergeCommon.py
2005-09-12 Fredrik Kuivinen[PATCH] Make the ProgramError class printable.
2005-09-12 Fredrik Kuivinen[PATCH] Introduce a 'die' function.
2005-09-11 Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.