Merge branch 'al/ansi-color' into next
commit70cf90c70fdadb9e9ed899c547cb4ede2477acc3
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 07:46:27 +0000 (4 23:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 07:46:27 +0000 (4 23:46 -0800)
treea7a1d28f76f313e87732d6bbc358e7849f7ac723
parentd5d1d8dae9af783381e26bd2d7ff524c945365b4
parent74bb2dfbec15ad47242b9a879b5547b6f4a28318
Merge branch 'al/ansi-color' into next

* al/ansi-color:
  builtin-branch.c: Rename branch category color names
  Clean up use of ANSI color sequences
builtin-branch.c
diff.c
pretty.c