summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-25 06:43:03 -0400
committerJeff King <peff@peff.net>2012-10-25 06:43:03 -0400
commit2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (patch)
tree69a2c86a062be469fab032cfdb017134343a6147 /merge-recursive.h
parentbbbd0573895f7f79aeb1faa5c0333915947096c0 (diff)
parent08ad56f3f0c1df8f75bac84bcef0d9d0c9b4d20f (diff)
downloadgit-2cfceefaca16d64baecf0ba9bcd4e05229d9c31b.tar.gz
Merge branch 'jk/strbuf-detach-always-non-null'
* jk/strbuf-detach-always-non-null: strbuf: always return a non-NULL value from strbuf_detach
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions