diff -r 8e5b21ce8ee9 -r 6c40ea34ecc1 tests/test-shelve.t
--- a/tests/test-shelve.t	Mon Apr 07 23:10:20 2014 +0200
+++ b/tests/test-shelve.t	Mon Apr 07 23:10:20 2014 +0200
@@ -531,7 +531,7 @@
   z
 
 
-unshelve and conflicts with untracked files
+unshelve and conflicts with tracked and untracked files
 
  preparing:
 
@@ -546,7 +546,7 @@
   $ hg shelve
   shelved as default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ echo gold > f
+  $ echo g > f
   $ hg unshelve
   unshelving change 'default'
   $ hg st
@@ -555,7 +555,7 @@
   $ cat f
   f
   $ cat f.orig
-  gold
+  g
 
  other uncommitted changes - merge:
 
@@ -576,7 +576,7 @@
   o  0  a  test
   
   $ mv f.orig f
-  $ echo other change >> a
+  $ echo 1 > a
   $ hg unshelve --date '1073741824 0'
   unshelving change 'default'
   temporarily committing pending changes (restore with 'hg unshelve --abort')
@@ -602,12 +602,12 @@
   ? f.orig
   $ cat f
   <<<<<<< local
-  gold
+  g
   =======
   f
   >>>>>>> other
   $ cat f.orig
-  gold
+  g
   $ hg unshelve --abort
   rebase aborted
   unshelve of 'default' aborted
@@ -615,7 +615,7 @@
   M a
   ? f.orig
   $ cat f.orig
-  gold
+  g
   $ hg unshelve
   unshelving change 'default'
   temporarily committing pending changes (restore with 'hg unshelve --abort')
@@ -645,18 +645,22 @@
   ? f.orig
   $ cat f
   <<<<<<< local
-  gold
+  g
   =======
   f
   >>>>>>> other
   $ cat f.orig
-  gold
+  g
   $ hg unshelve --abort
   rebase aborted
   no changes needed to a
   no changes needed to d
   no changes needed to e
   unshelve of 'default' aborted
+  $ hg st
+  ? f.orig
+  $ cat f.orig
+  g
   $ hg shelve --delete default
 
   $ cd ..