merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 12 Nov 2015 13:51:09 -0600
changeset 26908 150fb782ef80
parent 26907 dfab6edb98e3 (current diff)
parent 26905 0994ef28e798 (diff)
child 26909 e36118815a39
merge with stable
--- a/tests/test-bundle-type.t	Mon Nov 02 15:59:12 2015 +0000
+++ b/tests/test-bundle-type.t	Thu Nov 12 13:51:09 2015 -0600
@@ -34,7 +34,7 @@
   >   hg init t$t
   >   cd t1
   >   hg bundle -t $t ../b$t ../t$t
-  >   cut -b 1-6 ../b$t | head -n 1
+  >   f -q -B6 -D ../b$t; echo
   >   cd ../t$t
   >   hg debugbundle ../b$t
   >   echo