mergetools / vimdiff3on commit Merge branch 'pc/submodule-helper' into next (53b4524)
   1. "$MERGE_TOOLS_DIR/vimdiff"