mergetools / vimdiff2on commit Merge branch 'tb/test-lint-echo-e' into maint (181f145)
   1. "$MERGE_TOOLS_DIR/vimdiff"