summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
AgeCommit message (Collapse)AuthorFilesLines
2005-09-19Ship our own copy of subprocess.pyLibravatar Junio C Hamano1-6/+0
so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13[PATCH] Use the 'die' function where it is appropriate.Libravatar Fredrik Kuivinen1-14/+13
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-12[PATCH] Make the ProgramError class printable.Libravatar Fredrik Kuivinen1-0/+3
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-12[PATCH] Introduce a 'die' function.Libravatar Fredrik Kuivinen1-4/+8
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano1-0/+268
I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net>