diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-15 13:48:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 13:48:01 +0900 |
| commit | 5b900fb812f678183d2810427b8862eb7f0dc22b (patch) | |
| tree | d5d98738de8e385869bae82143f47f4793200150 /streaming.c | |
| parent | Merge branch 'en/fast-imexport-nested-tags' (diff) | |
| parent | t4214: demonstrate octopus graph coloring failure (diff) | |
| download | tgif-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 'streaming.c')
0 files changed, 0 insertions, 0 deletions