mergetools / vimdiff2on commit Merge branch 'jc/t1512-fix' into maint (069dba2)
   1. "$MERGE_TOOLS_DIR/vimdiff"