summaryrefslogtreecommitdiff
path: root/git-merge-fredrik.py
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-131-429/+0
* [PATCH] Make sure we die if we don't get enough arguments.Fredrik Kuivinen2005-09-121-0/+3
* [PATCH] Introduce a 'die' function.Fredrik Kuivinen2005-09-121-10/+5
* [PATCH] Exit with status code 2 if we get an exception.Fredrik Kuivinen2005-09-121-7/+12
* [PATCH] Fix assertion failure when merging common ancestors.Fredrik Kuivinen2005-09-121-1/+1
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-101-0/+426