diff tests/test-diff-newlines.t @ 23048:ee5f834077be stable

merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents c63a09b6b337
children aaa1f8f514cf
line wrap: on
line diff
--- a/tests/test-diff-newlines.t	Fri Oct 10 11:38:00 2014 -0500
+++ b/tests/test-diff-newlines.t	Sat Oct 18 18:04:31 2014 -0500
@@ -1,6 +1,6 @@
   $ hg init
 
-  $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
+  $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
   $ hg ci -Ama -d '1 0'
   adding a