Merge branch 'al/ansi-color'

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

diff --cc builtin-branch.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc pretty.c
Simple merge