changeset 44455 | 4152183acedd |
parent 35400 | 4441705b7111 |
--- a/tests/test-mq-merge.t Fri Jan 24 15:28:37 2020 -0800 +++ b/tests/test-mq-merge.t Fri Jan 24 15:51:19 2020 -0800 @@ -132,7 +132,6 @@ patch didn't work out, merging patcha 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) applying patcha2 now at: patcha2