Code

Merge branch 'jk/maint-decorate-01-bool' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:34 +0000 (16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:34 +0000 (16:00 -0800)
* jk/maint-decorate-01-bool:
  log.decorate: accept 0/1 bool values

1  2 
config.c
t/t4202-log.sh

diff --cc config.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge