mergetools / gvimdiff3on commit Merge branch 'pc/submodule-helper' (a1bf46e)
   1. "$MERGE_TOOLS_DIR/vimdiff"