mergetools / gvimdiffon commit Merge branch 'pd/completion-filenames-fix' (e82f629)
   1. "$MERGE_TOOLS_DIR/vimdiff"