Junio C Hamano 6998d890c7 Merge branch 'jk/color-diff-plain-is-context' into maint ...

"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.

* jk/color-diff-plain-is-context:
  diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
  diff: accept color.diff.context as a synonym for "plain"

2015-06-25 11:02:11 -07:00

135 KiB

Raw Permalink Blame History

View Raw