mergetools / gvimdiff2on commit Merge branch 'sb/submodule-parallel-update' (4add209)
   1. "$MERGE_TOOLS_DIR/vimdiff"