Mercurial > hg

annotate tests/test-simplemerge.py.out @ 26309:44918682093f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsstore: delay loading markers from obsstore file This will allow us to use cached revisions without parsing obsstore. Because _version isn't determined at __init__, the debugobsconvert command no longer works correctly. I'll fix it by a separate patch for the evolve extension.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 13 Sep 2015 17:52:37 +0900
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