# HG changeset patch # User Pierre-Yves David # Date 2021-12-03 11:19:36 # Node ID 51f5219004736e5a7ad856f885b71df92f797977 # Parent acdd4a42deaa43f7f5ca7f26504569cd5d3c47d7 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 diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t --- a/tests/test-update-branches.t +++ b/tests/test-update-branches.t @@ -221,6 +221,11 @@ Cases are run as shown in that table, ro 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