summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:56 (GMT)
commit82fa169d551d71fd21d8a6368040e19d209f79ab (patch)
tree9ea4a78018a370d809350be858d9010b659a9b18 /revision.h
parentb3eb70e0f8988dbf36f42e0bea201e2cd71f248e (diff)
parent9881b451f33b7b0df247a4b28a9c08c65eb4ca95 (diff)
downloadgit-82fa169d551d71fd21d8a6368040e19d209f79ab.zip
git-82fa169d551d71fd21d8a6368040e19d209f79ab.tar.gz
git-82fa169d551d71fd21d8a6368040e19d209f79ab.tar.bz2
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