Mercurial Mercurial > hg-stable / 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-merge-types.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 09 Nov 2007 21:24:25 -0200
changeset 5528 6ffca2bf23da
parent 5509 305b035c5fda
child 5710 026eb80060d8
permissions -rw-r--r--
merge with crew-stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5509
305b035c5fda Mark failing test as a known bug
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
### This test is for a known, unfixed bug ###
hg-stable