| commit | 5b900fb812f678183d2810427b8862eb7f0dc22b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Oct 2019 04:48:01 +0000 (15 13:48 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Oct 2019 04:48:01 +0000 (15 13:48 +0900) | ||
| tree | d5d98738de8e385869bae82143f47f4793200150 | treesnapshot (tar.gz zip) |
| parent | 16d9d7184bbf39e8c1c9c4756805278f530be30f | commitdiff |
| parent | 11c21f22ded635bec5e10c833697c55aab442776 | commitdiff |
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
"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
| t/test-lib-functions.sh | diff1 | diff2 | blobhistory |