summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
commitd7173d942ea897b67ac9ba3bab2a0cc374684ca6 (patch)
tree30470f05d89570e5d2e125feb140b4b3da630a39 /xdiff
parentMerge branch 'cc/reset-keep' (diff)
parentcolor: allow multiple attributes (diff)
downloadtgif-d7173d942ea897b67ac9ba3bab2a0cc374684ca6.tar.xz
Merge branch 'jc/color-attrs'
* jc/color-attrs: color: allow multiple attributes
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions