summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-18 21:42:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-18 21:42:41 -0700
commit2c4cf667b0b516ffd547e58d7aaf7b584929715a (patch)
treeeb718210d6bdf27f93edd397375165c31f3ae3a8 /merge-file.h
parentUpdate draft release notes to 1.7.8 (diff)
parentstrbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() (diff)
downloadtgif-2c4cf667b0b516ffd547e58d7aaf7b584929715a.tar.xz
Merge branch 'maint'
* maint: strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions