diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:42 -0700 |
commit | 48aa37ed4266e75340abd3232860d6d14a30c774 (patch) | |
tree | 3e60b02a98d98b64b604da514f345561fed293c6 /resolve-undo.c | |
parent | ee7fd70edfc51ec88865c573ff950b4dfbef1833 (diff) | |
parent | 31471ba21ee29886ab856981e52f723c913d7f40 (diff) | |
download | git-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