mergetools / gvimdiff2on commit Merge branch 'jl/submodule-mv' (b02f5ae)
   1. "$MERGE_TOOLS_DIR/vimdiff"