Mercurial > hg

annotate tests/test-simplemerge.py.out @ 30189:4999c12c526b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: test coverage of fatal interruption of update Test using existing changesets in a clean working directory, revealing problems with files that don't show up as modified or do show up as removed when they just not have been written yet.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 16 Oct 2016 02:26:38 +0200
parents f18830651811
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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