mergetools / vimdiff2on commit Merge branch 'rr/tests-dedup-test-config' into maint (5753e17)
   1. "$MERGE_TOOLS_DIR/vimdiff"