changeset 33721 | 24849d53697d |
parent 33286 | 2428e8ec0793 |
child 33968 | 06a740540ea1 |
--- a/tests/test-merge1.t Thu Jun 15 13:32:32 2017 -0400 +++ b/tests/test-merge1.t Thu Jun 15 14:22:25 2017 -0400 @@ -1,4 +1,5 @@ $ cat <<EOF > merge + > from __future__ import print_function > import sys, os > > try: @@ -8,7 +9,7 @@ > except ImportError: > pass > - > print "merging for", os.path.basename(sys.argv[1]) + > print("merging for", os.path.basename(sys.argv[1])) > EOF $ HGMERGE="$PYTHON ../merge"; export HGMERGE