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-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 15 Aug 2007 16:22:12 -0700
changeset 5175 f8aa16533ddf
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Merge with crew-stable

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
mercurial-crew-with-dirclash