Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge.py.out @ 4675:6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Thu, 21 Jun 2007 10:40:09 -0700 |
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 |