mergetools / vimdiff2on commit Merge branch 'sb/submodule-update-try-harder' (a173ddd)
   1. "$MERGE_TOOLS_DIR/vimdiff"