branch | stable |
changeset 49366 | 288de6f5d724 |
parent 48969 | f64bbba2ee59 |
--- a/tests/test-merge-halt.t Thu Jun 16 15:15:03 2022 +0200 +++ b/tests/test-merge-halt.t Thu Jun 16 15:28:54 2022 +0200 @@ -210,6 +210,6 @@ merge halted after failed merge (see hg resolve) [240] $ hg shelve --list - default (* ago) changes to: foo (glob) + default (*s ago) * changes to: foo (glob) $ hg unshelve --abort unshelve of 'default' aborted