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 Matt Mackall <mpm@selenic.com>
Thu, 05 Jul 2007 13:34:18 -0500
changeset 4815 8808ea7da86b
parent 3592 fffc8a733bf9
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

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