branch | mercurial-4.3 |
changeset 4002 | 21eab0a99841 |
parent 3936 | 537fd9a86c06 |
parent 3995 | 684cc3418ecd |
child 4077 | 9c025ec4af88 |
--- a/tests/test-evolve.t Fri Aug 03 00:22:50 2018 +0200 +++ b/tests/test-evolve.t Tue Aug 21 14:09:33 2018 +0200 @@ -1509,7 +1509,7 @@ | | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 | | - | | o 39:02e943732647@default(draft) will cause conflict at evolve + | | @ 39:02e943732647@default(draft) will cause conflict at evolve | | | | | x 38:f8e30e9317aa@default(draft) will be evolved safely | |/