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