Mercurial
Mercurial
>
hg
>
mercurial-crew-with-dirclash
/ file revision
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, 05 Jul 2007 13:34:18 -0500
changeset 4815
8808ea7da86b
parent 4360
d5c3a70f8422
child 5115
ea7b982b6c08
permissions
-rw-r--r--
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
(binary:application/octet-stream)