summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
Commit message (Expand)AuthorAgeFilesLines
* remove merge-recursive-oldJunio C Hamano2006-11-211-275/+0
* merge-recursive: Speed up commit graph constructionFredrik Kuivinen2006-02-021-1/+4
* merge-recursive: Add copyright noticeFredrik Kuivinen2005-11-111-0/+4
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-031-1/+1
* Ship our own copy of subprocess.pyJunio C Hamano2005-09-191-6/+0
* [PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen2005-09-131-14/+13
* [PATCH] Make the ProgramError class printable.Fredrik Kuivinen2005-09-121-0/+3
* [PATCH] Introduce a 'die' function.Fredrik Kuivinen2005-09-121-4/+8
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-101-0/+268