summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
Commit message (Expand)AuthorAgeFilesLines
* [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