Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Jan 2011 00:40:09 +0000 (16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jan 2011 00:40:09 +0000 (16:40 -0800)
* master:
  t3032: limit sed branch labels to 8 characters
  t0001,t1510,t3301: use sane_unset which always returns with status 0
  trace.c: ensure NULL is not passed to printf

1  2 
t/t3032-merge-recursive-options.sh

Simple merge