Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simplemerge.py.out
author Matt Mackall <mpm@selenic.com>
Tue, 12 Jul 2011 16:27:03 -0500
changeset 14858 1a52f04ac51b
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
merge with stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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















Mercurial