summaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-25 12:43:03 +0200
committerJeff King <peff@peff.net>2012-10-25 12:43:03 +0200
commit2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (patch)
tree69a2c86a062be469fab032cfdb017134343a6147 /merge.c
parentMerge branch 'js/mingw-fflush-errno' (diff)
parentstrbuf: always return a non-NULL value from strbuf_detach (diff)
downloadgit-2cfceefaca16d64baecf0ba9bcd4e05229d9c31b.tar.xz
git-2cfceefaca16d64baecf0ba9bcd4e05229d9c31b.zip
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.c')
0 files changed, 0 insertions, 0 deletions