Mercurial > hg

annotate tests/test-simplemerge.py.out @ 6349:6aaf5b1d8f15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coverage: deal with symlinked input paths (MacOSX issue) /tmp is symlinked in MacOSX therefore test scripts as well as python modules are installed in a symlinked location. coverage.py uses abspath() to normalize its inputs which fails if these are referencing real paths. Use realpath() instead.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 22 Mar 2008 19:01:09 +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