aboutsummaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
Commit message (Expand)AuthorAge
* Ship our own copy of subprocess.pyJunio C Hamano2005-09-19
* [PATCH] Use the 'die' function where it is appropriate.Fredrik Kuivinen2005-09-13
* [PATCH] Make the ProgramError class printable.Fredrik Kuivinen2005-09-12
* [PATCH] Introduce a 'die' function.Fredrik Kuivinen2005-09-12
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10