mergetools / gvimdiff2on commit Merge branch 'jl/test-lint-scripts' (ce33d61)
   1. "$MERGE_TOOLS_DIR/vimdiff"