summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-11-07 14:37:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-07 14:37:11 -0800
commit46992b5411508b3b1a77d3178440efa77774a367 (patch)
tree158b733e6b48ad060232f26333ac2c66a5c7f2ec /object.h
parentMerge branch 'mm/checkout-auto-track-fix' into maint (diff)
parentgraph: fix coloring around octopus merges (diff)
downloadtgif-46992b5411508b3b1a77d3178440efa77774a367.tar.xz
Merge branch 'hn/log-graph-color-octopus' into maint
Coloring around octopus merges in "log --graph" output was screwy. * hn/log-graph-color-octopus: graph: fix coloring around octopus merges
Diffstat (limited to 'object.h')
0 files changed, 0 insertions, 0 deletions