author | Markus F.X.J. Oberhumer <markus@oberhumer.com> |
Mon, 25 Jun 2007 14:46:20 +0200 | |
changeset 4706 | f0aa759b8f93 |
parent 4359 | 2e3c54fb79a3 |
permissions | -rw-r--r-- |
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 |