Merge branch 'en/merge-tree-sequence'
commitb1e3dd68ee5e078b04d26da78df81eeb601e0837
authorTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:44 +0000 (30 21:04 -0400)
committerTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:44 +0000 (30 21:04 -0400)
treea0a34da888b617647c39f1cb7f8d69380f31a363
parentd32dd8add53120cef9b30be4240010c2ab6bfc6f
parentec1edbcb56ac05e9980299b05924c5c1b51d68b4
Merge branch 'en/merge-tree-sequence'

"git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.

* en/merge-tree-sequence:
  merge-tree: support multiple batched merges with --stdin
  merge-tree: update documentation for differences in -z output