summaryrefslogtreecommitdiff
path: root/builtin/mktree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-15 13:48:01 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-15 13:48:01 +0900
commit5b900fb812f678183d2810427b8862eb7f0dc22b (patch)
treed5d98738de8e385869bae82143f47f4793200150 /builtin/mktree.c
parentMerge branch 'en/fast-imexport-nested-tags' (diff)
parentt4214: demonstrate octopus graph coloring failure (diff)
downloadtgif-5b900fb812f678183d2810427b8862eb7f0dc22b.tar.xz
Merge branch 'dl/octopus-graph-bug'
"git log --graph" for an octopus merge is sometimes colored incorrectly, which is demonstrated and documented but not yet fixed. * dl/octopus-graph-bug: t4214: demonstrate octopus graph coloring failure t4214: explicitly list tags in log t4214: generate expect in their own test cases t4214: use test_merge test-lib: let test_merge() perform octopus merges
Diffstat (limited to 'builtin/mktree.c')
0 files changed, 0 insertions, 0 deletions