mergetools / gvimdiff3on commit Merge branch 'mc/git-p4-prepare-p4-only' (2a20f4b)
   1. "$MERGE_TOOLS_DIR/vimdiff"