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