summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
AgeCommit message (Expand)AuthorFilesLines
2005-11-11merge-recursive: Add copyright noticeLibravatar Fredrik Kuivinen1-0/+4
2005-10-03[PATCH] Enable and fix support for base less merges.Libravatar Fredrik Kuivinen1-1/+1
2005-09-19Ship our own copy of subprocess.pyLibravatar Junio C Hamano1-6/+0
2005-09-13[PATCH] Use the 'die' function where it is appropriate.Libravatar Fredrik Kuivinen1-14/+13
2005-09-12[PATCH] Make the ProgramError class printable.Libravatar Fredrik Kuivinen1-0/+3
2005-09-12[PATCH] Introduce a 'die' function.Libravatar Fredrik Kuivinen1-4/+8
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano1-0/+268