Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

Commit d13b51c9 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

update: add a test for `--merge` overriding the "abort" config

I don't see this behavior tested anywhere.

Differential Revision: https://phab.mercurial-scm.org/D11850
parent acdd4a42deaa
......@@ -221,6 +221,11 @@ Cases are run as shown in that table, row by row.
parent=1
M foo
$ revtest '--merge none dirty linear' dirty 1 2 --merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
M foo
$ revtest 'none dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
......
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