summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-27 11:36:43 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-27 11:36:43 -0700
commitc5a5f12e5a514d198f49a76d4e001c88570bf7d1 (patch)
treeb66c2a8a2596b27f922fd2b9aa476895037a8780 /resolve-undo.c
parent2a2dbd2770b4dbda59b5b22e19fac973d08d0864 (diff)
parente96c19c50fb0807570b85cb5b8aae6dfcfa9b9ec (diff)
downloadgit-c5a5f12e5a514d198f49a76d4e001c88570bf7d1.tar.gz
Merge branch 'ef/maint-strbuf-init'
* ef/maint-strbuf-init: config: support values longer than 1023 bytes strbuf: make sure buffer is zero-terminated
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions