Mercurial > hg > mercurial-crew
diff tests/test-merge9.t @ 27258:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 21:56:39 -0700 |
| parents | ef1eb6df7071 |
| children |
line wrap: on
line diff
--- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -27,8 +27,8 @@ test with the rename on the remote side $ HGMERGE=false hg merge merging bar + merging foo and baz to baz merging bar failed! - merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -41,8 +41,8 @@ 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ HGMERGE=false hg merge merging bar + merging baz and foo to baz merging bar failed! - merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]