Mercurial > hg
annotate tests/test-simplemerge.py.out @ 41775:a86e22007b54
largefiles: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6015
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 27 Dec 2017 22:32:27 -0800 |
parents | f18830651811 |
children |
rev | line source |
---|---|
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
4363
diff
changeset
|
1 ................ |
4363
2e3c54fb79a3
actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 ---------------------------------------------------------------------- |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
4363
diff
changeset
|
3 Ran 16 tests in 0.000s |
4363
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 |