summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:21 -0700
commit779503c5eb5fe822409cdf7c064a818bdc650f02 (patch)
tree0ef387f1e66ddfbe4bde85b2dbdaa4281c24ee86 /notes-merge.h
parentMerge branch 'mm/checkout-auto-track-fix' (diff)
parentgraph: fix coloring around octopus merges (diff)
downloadtgif-779503c5eb5fe822409cdf7c064a818bdc650f02.tar.xz
Merge branch 'hn/log-graph-color-octopus'
* hn/log-graph-color-octopus: graph: fix coloring around octopus merges
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions