From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Apr 2020 20:42:56 +0000 (-0700)
Subject: Merge branch 'ma/simplify-merge-config-parsing'
X-Git-Tag: v2.27.0-rc0~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82fa169d551d71fd21d8a6368040e19d209f79ab;p=thirdparty%2Fgit.git

Merge branch 'ma/simplify-merge-config-parsing'

Code simplification.

* ma/simplify-merge-config-parsing:
  merge: use skip_prefix to parse config key
---

82fa169d551d71fd21d8a6368040e19d209f79ab