changeset 48969 | f64bbba2ee59 |
parent 48427 | 38941a28406a |
--- a/tests/test-merge-halt.t Tue Mar 15 09:26:26 2022 +0100 +++ b/tests/test-merge-halt.t Thu Mar 17 11:00:05 2022 +0100 @@ -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