# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1447357869 21600
# Node ID 150fb782ef80919e1c8cc7d4b047d78f889c7846
# Parent  dfab6edb98e33c7dddf6b63ea1a3144e5e90c99b# Parent  0994ef28e79877fddb5f42375203758fe94560c7
merge with stable

diff -r dfab6edb98e3 -r 150fb782ef80 tests/test-bundle-type.t
--- 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