tree 91d75bb9b5fa1147a170215badbff9a5da439382
parent 8a61097cde387870921e822bdf90b4ffd3792845
parent 74bb2dfbec15ad47242b9a879b5547b6f4a28318
author Junio C Hamano <gitster@pobox.com> 1236296479 -0800
committer Junio C Hamano <gitster@pobox.com> 1236296479 -0800

Merge branch 'al/ansi-color'

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