Mercurial > hg

annotate tests/test-simplemerge.py.out @ 13080:bdb73eede5fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-clone-failure.t: fix unification oversight Prior to unification, the test contained an 'echo $?' line. This line was removed during unification, but the 'echo 255' line that faked it when FIFO support is absent was not.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Wed, 01 Dec 2010 19:20:16 +0100
parents 2e3c54fb79a3
children f18830651811
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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