Commit 7e2d3952 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: update more exit codes in case conflicting changes

CORE-TEST-OUTPUT-UPDATE: dc00324e80f4
parent 1682b388be13
......@@ -431,7 +431,7 @@
$ hg prev
abort: conflicting changes
(do you want --merge?)
[255]
[20]
$ echo hi > bar
$ hg prev
......@@ -443,7 +443,7 @@
$ hg next
abort: conflicting changes
(do you want --merge?)
[255]
[20]
Test that --merge still works fine with commands.update.check set
......@@ -454,7 +454,7 @@
$ hg next
abort: conflicting changes
(do you want --merge?)
[255]
[20]
$ hg next --merge
merging bar
warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment