Mercurial > public > mercurial-scm > hg-stable

diff tests/test-resolve.t @ 26621:36383507a6f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: perform all premerges before performing any file merges (BC) Just like the BC to merge before it, this allows for a maximally consistent state before providing any prompts to the user.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 23:58:07 -0700
parents 7955127efbcb
children c0aab5961876
line wrap: on
line diff
--- a/tests/test-resolve.t	Sun Oct 11 23:56:44 2015 -0700
+++ b/tests/test-resolve.t	Sun Oct 11 23:58:07 2015 -0700
@@ -135,8 +135,8 @@
 resolve --all should re-merge all unresolved files
   $ hg resolve --all
   merging file1
+  merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
-  merging file2
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ cat file1.orig