Mercurial > hg-stable
diff tests/test-status-color.t @ 26618: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 | 3356bf61fa25 |
line wrap: on
line diff
--- a/tests/test-status-color.t Sun Oct 11 20:12:12 2015 -0700 +++ b/tests/test-status-color.t Sun Oct 11 21:56:39 2015 -0700 @@ -325,8 +325,8 @@ created new head $ hg merge merging a + merging b warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 2 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon