mergetools / vimdiff3on commit Merge branch 'es/rebase-i-count-todo' into maint (f63ed08)
   1. "$MERGE_TOOLS_DIR/vimdiff"