Mercurial > public > mercurial-scm > hg

diff tests/test-conflict.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
parents f2daa6ab514a
children 2371f4aea665
line wrap: on
line diff
--- a/tests/test-conflict.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-conflict.t	Thu Sep 16 17:51:32 2010 -0500
@@ -16,6 +16,7 @@
   merging a failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
 
   $ hg id
   32e80765d7fe+75234512624c+ tip