Mercurial > hg

diff tests/test-rename-merge1.t @ 26618:8e6d5b7317e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d8463a743d7d
children d16d73173fdd
line wrap: on
line diff
--- a/tests/test-rename-merge1.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-rename-merge1.t	Sun Oct 11 21:56:39 2015 -0700
@@ -40,7 +40,7 @@
   removing a
    b2: remote created -> g
   getting b2
-   b: remote moved from a -> m
+   b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c