changeset 45827 | 8d72e29ad1e0 |
parent 43873 | 8caec25f5d8f |
child 49621 | 55c6ebd11cb9 |
--- a/tests/test-merge-default.t Wed Oct 21 19:00:16 2020 -0700 +++ b/tests/test-merge-default.t Tue Oct 06 22:36:15 2020 -0700 @@ -69,7 +69,7 @@ $ hg merge --config commands.merge.require-rev=True abort: configuration requires specifying revision to merge with - [255] + [10] Should succeed - 2 heads: @@ -101,7 +101,7 @@ $ hg merge --config commands.merge.require-rev=True abort: configuration requires specifying revision to merge with - [255] + [10] Should fail because at tip: