--- a/tests/test-resolve.t Wed Oct 08 22:16:18 2014 -0700
+++ b/tests/test-resolve.t Wed Oct 08 22:30:04 2014 -0700
@@ -88,16 +88,14 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-BROKEN: resolve --all should do nothing in merge without conflicts
+resolve --all should do nothing in merge without conflicts
$ hg resolve --all
- abort: resolve command not applicable when not merging
- [255]
+ (no more unresolved files)
-BROKEN: resolve -m should do nothing in merge without conflicts
+resolve -m should do nothing in merge without conflicts
$ hg resolve -m
- abort: resolve command not applicable when not merging
- [255]
+ (no more unresolved files)
get back to conflicting state