mergetools / vimdiff2on commit Merge branch 'se/doc-checkout-ours-theirs' into maint (204ea3c)
   1. "$MERGE_TOOLS_DIR/vimdiff"