mergetools / gvimdiffon commit merge: fix GIT_EDITOR override for commit hook (0a3beb0)
   1. "$MERGE_TOOLS_DIR/vimdiff"