branch | stable |
changeset 50324 | e6532a7336d0 |
parent 50322 | 08f3875020d1 |
child 50404 | 64cdd80d6909 |
--- a/tests/test-hook.t Thu Mar 23 21:18:14 2023 +0000 +++ b/tests/test-hook.t Thu Mar 23 21:18:54 2023 +0000 @@ -1466,6 +1466,5 @@ $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) - warning: ignoring unknown working parent 449f60fb3fe2! (known-bad-output !) $ cd ..