summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-24 16:24:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-24 16:24:13 -0700
commit0476228de500049804ae599f557658c3f9042ad0 (patch)
tree4c9185465412afb414bdfb5688f1f804ba3d9fc4 /xdiff
parentMerge branch 'jk/maint-add-ignored-dir' into maint (diff)
parentcolor: allow multiple attributes (diff)
downloadtgif-0476228de500049804ae599f557658c3f9042ad0.tar.xz
Merge branch 'jc/color-attrs' into maint
* jc/color-attrs: color: allow multiple attributes
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions