Merge branch 'al/ansi-color'
commit4a2caf691232ef9599ee3f1a1a04a47f309e65c1
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:19 +0000 (5 15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:19 +0000 (5 15:41 -0800)
tree91d75bb9b5fa1147a170215badbff9a5da439382
parent8a61097cde387870921e822bdf90b4ffd3792845
parent74bb2dfbec15ad47242b9a879b5547b6f4a28318
Merge branch 'al/ansi-color'

* 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