3 commits

Author	SHA1	Message	Date
Fredrik Kuivinen	4e48fe3f1c	[PATCH] Make the ProgramError class printable. ... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-12 14:54:00 -07:00
Fredrik Kuivinen	654291a2ac	[PATCH] Introduce a 'die' function. ... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-12 14:53:58 -07:00
Junio C Hamano	720d150c48	Add a new merge strategy by Fredrik Kuivinen. ... 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>	2005-09-10 19:46:53 -07:00