mergetools / vimdiff2on commit Merge branch 'en/checkout-mismerge-fix' (d1a251a)
   1. "$MERGE_TOOLS_DIR/vimdiff"