changeset 33721 | 24849d53697d |
parent 33286 | 2428e8ec0793 |
child 34661 | eb586ed5d8ce |
--- a/tests/test-merge6.t Thu Jun 15 13:32:32 2017 -0400 +++ b/tests/test-merge6.t Thu Jun 15 14:22:25 2017 -0400 @@ -1,6 +1,6 @@ $ cat <<EOF > merge > import sys, os - > print "merging for", os.path.basename(sys.argv[1]) + > print("merging for", os.path.basename(sys.argv[1])) > EOF $ HGMERGE="$PYTHON ../merge"; export HGMERGE