branch | mercurial-4.5 |
changeset 4314 | 1fd2440afaf7 |
parent 4313 | 4a740f9eee49 |
child 4315 | 55ca0b6276e7 |
--- a/tests/test-stabilize-result.t Fri Dec 21 20:14:21 2018 +0100 +++ b/tests/test-stabilize-result.t Mon Dec 24 17:47:29 2018 +0100 @@ -93,7 +93,6 @@ +a +newer a $ hg evolve --continue - evolving 4:3655f0f50885 "newer a" abort: unresolved merge conflicts (see 'hg help resolve') [255] $ hg resolve -m a