mergetools / vimdiff3on commit Merge branch 'jk/completion-rebase' into maint (d509fa4)
   1. "$MERGE_TOOLS_DIR/vimdiff"