--- a/tests/test-resolve.t Wed Feb 11 13:55:15 2015 +0900
+++ b/tests/test-resolve.t Wed Feb 11 13:59:13 2015 +0900
@@ -43,6 +43,10 @@
U file1
U file2
+ $ hg resolve -l --no-status
+ file1
+ file2
+
resolving an unknown path should emit a warning, but not for -l
$ hg resolve -m does-not-exist
@@ -60,6 +64,18 @@
R file1
U file2
+ $ hg resolve -l -Tjson
+ [
+ {
+ "path": "file1",
+ "status": "R"
+ },
+ {
+ "path": "file2",
+ "status": "U"
+ }
+ ]
+
resolve -m without paths should mark all resolved
$ hg resolve -m
@@ -70,6 +86,10 @@
$ hg resolve -l
+ $ hg resolve -l -Tjson
+ [
+ ]
+
resolve --all should abort when no merge in progress
$ hg resolve --all