summaryrefslogtreecommitdiffstats
path: root/gitMergeCommon.py (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: Add copyright noticeFredrik Kuivinen2005-11-121-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-201-6/+0
* [PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen2005-09-141-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-111-0/+268