Mercurial > public > mercurial-scm > hg

annotate tests/test-simplemerge.py.out @ 12683:ada47c38f4e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: don't detect copies as "divergent renames" (For the purposes of this patch copy is defined as a rename where the source continues to exist.)
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Sun, 10 Oct 2010 09:48:37 -0500
parents 2e3c54fb79a3
children f18830651811
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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