# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448315156 28800
# Node ID 72b4e1bf8f282c65217cd6c7b49dbf27ee289d97
# Parent  969ca40cad1dbae493c5796da30504ebed4cfaa1
test-merge-changedelete.t: add resolve --list output

We're going to move change/delete conflicts to the resolve phase, and the
resolve --list output is one of the things that will be important to test.

diff -r 969ca40cad1d -r 72b4e1bf8f28 tests/test-merge-changedelete.t
--- a/tests/test-merge-changedelete.t	Mon Nov 23 13:43:14 2015 -0800
+++ b/tests/test-merge-changedelete.t	Mon Nov 23 13:45:56 2015 -0800
@@ -11,6 +11,8 @@
   $ status() {
   >     echo "--- status ---"
   >     hg st -A file1 file2 file3
+  >     echo "--- resolve --list ---"
+  >     hg resolve --list file1 file2 file3
   >     for file in file1 file2 file3; do
   >         if [ -f $file ]; then
   >             echo "--- $file ---"
@@ -64,6 +66,8 @@
   M file2
   M file3
   C file1
+  --- resolve --list ---
+  U file3
   --- file1 ---
   1
   changed
@@ -103,6 +107,8 @@
   file2: * (glob)
   M file3
   C file1
+  --- resolve --list ---
+  U file3
   --- file1 ---
   1
   changed
@@ -152,6 +158,8 @@
   M file2
   M file3
   R file1
+  --- resolve --list ---
+  U file3
   *** file1 does not exist
   --- file2 ---
   2
@@ -184,6 +192,7 @@
   file2: * (glob)
   C file1
   C file3
+  --- resolve --list ---
   --- file1 ---
   1
   changed
@@ -209,6 +218,7 @@
   A file1
   C file2
   C file3
+  --- resolve --list ---
   --- file1 ---
   1
   changed