diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:56 -0700 |
commit | 82fa169d551d71fd21d8a6368040e19d209f79ab (patch) | |
tree | 9ea4a78018a370d809350be858d9010b659a9b18 /revision.h | |
parent | b3eb70e0f8988dbf36f42e0bea201e2cd71f248e (diff) | |
parent | 9881b451f33b7b0df247a4b28a9c08c65eb4ca95 (diff) | |
download | git-82fa169d551d71fd21d8a6368040e19d209f79ab.tar.gz |
Merge branch 'ma/simplify-merge-config-parsing'
Code simplification.
* ma/simplify-merge-config-parsing:
merge: use skip_prefix to parse config key
Diffstat (limited to 'revision.h')
0 files changed, 0 insertions, 0 deletions