mergetools / vimdiff2on commit Merge branch 'we/submodule-update-prefix-output' (28ed8d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"