mergetools / vimdiff3on commit Merge branch 'jc/t5601-copy-workaround' into maint (2e13879)
   1. "$MERGE_TOOLS_DIR/vimdiff"