mergetools / vimdiff3on commit Merge branch 'jk/rebase-i-squash-count-fix' into maint (2b3f61d)
   1. "$MERGE_TOOLS_DIR/vimdiff"