changeset 44381 | 9c9cfecd4600 |
parent 44379 | 14d0e89520a2 |
child 44567 | 254c5f71e2df |
--- a/tests/test-rebase-collapse.t Fri Jan 10 14:17:56 2020 -0800 +++ b/tests/test-rebase-collapse.t Fri Jan 10 14:22:20 2020 -0800 @@ -712,7 +712,7 @@ | | @ 2: 82b8abf9c185 'D' | | - @ | 1: f899f3910ce7 'B' + % | 1: f899f3910ce7 'B' |/ o 0: 4a2df7238c3b 'A' @@ -736,7 +736,7 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg tglog - @ 3: 63668d570d21 'C' + % 3: 63668d570d21 'C' | | @ 2: 82b8abf9c185 'D' | |