summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:42 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:42 -0700
commit48aa37ed4266e75340abd3232860d6d14a30c774 (patch)
tree3e60b02a98d98b64b604da514f345561fed293c6 /resolve-undo.c
parentee7fd70edfc51ec88865c573ff950b4dfbef1833 (diff)
parent31471ba21ee29886ab856981e52f723c913d7f40 (diff)
downloadgit-48aa37ed4266e75340abd3232860d6d14a30c774.tar.gz
Merge branch 'rs/use-strbuf-addbuf' into maint
Code cleanup. * rs/use-strbuf-addbuf: strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf() use strbuf_addbuf() for appending a strbuf to another
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions