Fix off-by-one error in git-merge
[git.git] / git-merge-fredrik.py
2005-09-12 Fredrik Kuivinen[PATCH] Make sure we die if we don't get enough arguments.
2005-09-12 Fredrik Kuivinen[PATCH] Introduce a 'die' function.
2005-09-12 Fredrik Kuivinen[PATCH] Exit with status code 2 if we get an exception.
2005-09-12 Fredrik Kuivinen[PATCH] Fix assertion failure when merging common ances...
2005-09-11 Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.