Mercurial > hg
annotate tests/test-simplemerge.py.out @ 30844:b3d2e8cce78c stable
tests: work around FreeBSD's unzip having slightly different output
According to man 1 unzip, this unzip appeared in FreeBSD 8.0. It's
what comes as /usr/bin/unzip, so we may as well cater to it since it's
easy.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 18 Jan 2017 23:43:41 -0500 |
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 |