summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
AgeCommit message (Expand)Author
2006-11-22remove merge-recursive-oldJunio C Hamano
2006-02-02merge-recursive: Speed up commit graph constructionFredrik Kuivinen
2005-11-12merge-recursive: Add copyright noticeFredrik Kuivinen
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
2005-09-20Ship our own copy of subprocess.pyJunio C Hamano
2005-09-13[PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen
2005-09-12[PATCH] Make the ProgramError class printable.Fredrik Kuivinen
2005-09-12[PATCH] Introduce a 'die' function.Fredrik Kuivinen
2005-09-11Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano