Merge branch 'dl/branch-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2020 19:27:46 +0000 (12:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2020 19:27:47 +0000 (12:27 -0700)
commit7b2685ef2d637de333765f5406d36799894c9a38
treeb97772910a8383f97de80d0c671cf9ddcde12039
parenteb52351a1cdbf35fd305948e91eef585842dd4a3
parentdc44639904c9a0899854c79c97c248f3d3cc2bdc
Merge branch 'dl/branch-cleanup'

Code clean-up around "git branch" with a minor bugfix.

* dl/branch-cleanup:
  branch: don't mix --edit-description
  t3200: test for specific errors
  t3200: rename "expected" to "expect"
builtin/branch.c