mergetools / vimdiff2on commit Merge branch 'jl/submodule-update-retire-orig-flags' (c83386d)
   1. "$MERGE_TOOLS_DIR/vimdiff"