diff tests/test-impexp-branch.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents db6b958c4f35
children efedda4aed49
line wrap: on
line diff
--- a/tests/test-impexp-branch.t	Wed Jan 01 21:46:45 2014 -0600
+++ b/tests/test-impexp-branch.t	Tue Jan 21 14:30:06 2014 -0600
@@ -1,5 +1,5 @@
   $ echo '[extensions]' >> $HGRCPATH
-  $ echo 'mq =' >> $HGRCPATH
+  $ echo 'strip =' >> $HGRCPATH
 
   $ cat >findbranch.py <<EOF
   > import re, sys