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