--- a/tests/test-up-local-change.t	Wed Feb 03 15:21:11 2016 +0000
+++ b/tests/test-up-local-change.t	Tue Feb 02 15:24:11 2016 +0000
@@ -172,9 +172,8 @@
   summary:     2
   
   $ hg --debug up
-  abort: uncommitted changes
-  (commit and merge, or update --clean to discard changes)
-  [255]
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
 
 test conflicting untracked files