[PATCH] Adjust git-merge-recursive.py for the new tool names.