Code

Merge branch 'jk/maint-decorate-01-bool'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (11:24 -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