tests/test-simplemerge.py.out
author Mads Kiilerich <mads@kiilerich.com>
Fri, 18 Feb 2011 03:35:01 +0100
branchstable
changeset 13439 d724a69309e0
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
util: flush stdout before calling external processes stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4363
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     1
....................
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
----------------------------------------------------------------------
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     3
Ran 20 tests in 0.000s
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     4
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     5
OK