changeset 45895 | fc4fb2f17dd4 |
parent 44343 | 8561ad49915d |
child 49621 | 55c6ebd11cb9 |
--- a/tests/test-merge4.t Fri Nov 20 14:43:21 2020 -0800 +++ b/tests/test-merge4.t Mon Nov 16 16:00:50 2020 -0800 @@ -29,10 +29,10 @@ # Bad usage $ hg log -r 'conflictlocal(foo)' hg: parse error: conflictlocal takes no arguments - [255] + [10] $ hg log -r 'conflictother(foo)' hg: parse error: conflictother takes no arguments - [255] + [10] $ hg co -C . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # No merge parents when not merging