diff -r 6000f5b25c9b -r 42d2b31cee0b tests/test-filebranch.t --- a/tests/test-filebranch.t Thu Mar 03 17:34:00 2022 +0100 +++ b/tests/test-filebranch.t Sun Feb 20 15:28:44 2022 -0700 @@ -2,7 +2,6 @@ when we do a merge. $ cat < merge - > from __future__ import print_function > import sys, os > print("merging for", os.path.basename(sys.argv[1])) > EOF