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

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

Junio C Hamano committed Apr 22, 2020 at 13:42 UTC 82fa169d551d71fd21d8a6368040e19d209f79ab

No changes.