# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1397870802 25200
# Node ID f3e37409ecd39454d6415389d0232e320731cbd0
# Parent  edac098e6a557a20c3e827703e1a66096e1aee9a
resolve: split test

Part of test-resolve.t is split into multiple tests to create an
injection point for new tests that will be added in subsequent patches.

diff -r edac098e6a55 -r f3e37409ecd3 tests/test-resolve.t
--- a/tests/test-resolve.t	Fri Apr 18 18:19:46 2014 -0700
+++ b/tests/test-resolve.t	Fri Apr 18 18:26:42 2014 -0700
@@ -26,6 +26,13 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
+resolve -l should contain an unresolved entry
+
+  $ hg resolve -l
+  U file
+
+resolve the failure
+
   $ echo resolved > file
   $ hg resolve -m file
   $ hg commit -m 'resolved'