mergetools / gvimdiffon commit Merge branch 'po/git-p4-wo-login' (702bbfe)
   1. "$MERGE_TOOLS_DIR/vimdiff"