# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-10-12 06:54:40
# Node ID 3b213a904b9892b57d9d6a8dec2ea2bc33b0c1b1
# Parent  8e6d5b7317e600ba0de4b8e1a89499bb4f348bc8

test-resolve.t: add some output to show order of operations

This basically shows the behavior of resolve with multiple files. An upcoming
behavior change will cause this output to also change.

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -133,8 +133,10 @@ resolve without arguments should suggest
   [255]
 
 resolve --all should re-merge all unresolved files
-  $ hg resolve -q --all
+  $ hg resolve --all
+  merging file1
   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]
   $ grep '<<<' file1 > /dev/null