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-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Thu, 21 Jun 2007 18:02:03 -0500
changeset 4674 723e0ddb6ada
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
merge: warn user about divergent renames
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4364
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
hg-stable