Mercurial > hg > mercurial-source

diff tests/test-merge-revert2.t @ 12316:4134686b83e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500 (2010-09-16)
parents 28e2e3804f2e
children 2371f4aea665
line wrap: on
line diff
--- a/tests/test-merge-revert2.t
+++ b/tests/test-merge-revert2.t
@@ -48,6 +48,7 @@
   merging file1 failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
+  [1]
 
   $ hg diff --nodates
   diff -r dfab7f3c2efb file1