]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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"

1  2 
builtin/branch.c

Simple merge