Merge branch 'fixes'
[git.git] / gitMergeCommon.py
2005-10-03 Fredrik Kuivinen[PATCH] Enable and fix support for base less merges.
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-20 Junio C HamanoShip our own copy of subprocess.py
2005-09-14 Junio C HamanoMerge branch 'master' of .
2005-09-13 Fredrik Kuivinen[PATCH] Use the 'die' function where it is appropriate.
2005-09-13 Junio C HamanoMerge branch 'master' of .
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.