Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge.py.out @ 4724:a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Jun 2007 21:18:19 -0500 |
parents | 2e3c54fb79a3 |
children |
rev | line source |
---|---|
4359
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 |