Mercurial > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
---|---|
323 $ echo "file b change 2" > b | 323 $ echo "file b change 2" > b |
324 $ hg commit -m "head 2" | 324 $ hg commit -m "head 2" |
325 created new head | 325 created new head |
326 $ hg merge | 326 $ hg merge |
327 merging a | 327 merging a |
328 merging b | |
328 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 329 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
329 merging b | |
330 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 330 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
331 0 files updated, 0 files merged, 0 files removed, 2 files unresolved | 331 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
332 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 332 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
333 [1] | 333 [1] |
334 $ hg resolve -m b | 334 $ hg resolve -m b |