mergetools / vimdiff3on commit Merge branch 'ks/fix-rebase-doc-picture' into maint (bae7e3f)
   1. "$MERGE_TOOLS_DIR/vimdiff"