author | Henrik Stuart <henrik.stuart@edlund.dk> |
Tue, 12 May 2009 15:50:44 +0200 | |
changeset 8364 | fa901423ac23 |
parent 4363 | 2e3c54fb79a3 |
child 22023 | f18830651811 |
permissions | -rw-r--r-- |
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 |