Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge.py.out @ 4810:f7c8222920ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.
author Brendan Cully <brendan@kublai.com>
date Thu, 05 Jul 2007 12:18:01 -0700
parents 2e3c54fb79a3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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