mergetools / gvimdiff3on commit rebase -p: fix quoting when calling `git merge` (dd6fb00)
   1. "$MERGE_TOOLS_DIR/vimdiff"