changeset 33721 | 24849d53697d |
parent 33286 | 2428e8ec0793 |
child 34661 | eb586ed5d8ce |
--- a/tests/test-filebranch.t Thu Jun 15 13:32:32 2017 -0400 +++ b/tests/test-filebranch.t Thu Jun 15 14:22:25 2017 -0400 @@ -2,8 +2,9 @@ when we do a merge. $ cat <<EOF > merge + > from __future__ import print_function > 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