From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2020 19:27:46 +0000 (-0700)
Subject: Merge branch 'dl/branch-cleanup'
X-Git-Tag: v2.28.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b2685ef2d637de333765f5406d36799894c9a38;p=thirdparty%2Fgit.git

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"
---

7b2685ef2d637de333765f5406d36799894c9a38