Merge branch 'al/ansi-color'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:19 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:19 +0000 (15:41 -0800)
* al/ansi-color:
builtin-branch.c: Rename branch category color names
Clean up use of ANSI color sequences

1  2 
builtin-branch.c
diff.c
pretty.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc pretty.c
Simple merge