summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
AgeCommit message (Expand)Author
2005-09-14git-merge-recursive: Trivial RE fixes.Junio C Hamano
2005-09-13[PATCH] Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen
2005-09-13[PATCH] Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen
2005-09-13[PATCH] Don't output 'Automatic merge failed, ...'Fredrik Kuivinen
2005-09-13[PATCH] Be more like the 'resolve' strategy.Fredrik Kuivinen
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen