Mercurial > public > mercurial-scm > hg

diff tests/test-merge-force.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 2a06cb547be8
children 6c8573dd1b6b
line wrap: on
line diff
--- a/tests/test-merge-force.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge-force.t	Thu Sep 16 17:51:32 2010 -0500
@@ -20,6 +20,7 @@
 
   $ hg merge
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  [255]
 
 Should succeed with --force: