mergetools / vimdiff3on commit Merge branch 'sb/t1020-cleanup' into maint (5e896a3)
   1. "$MERGE_TOOLS_DIR/vimdiff"