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 Marco Barisione <marco@barisione.org>
Mon, 22 May 2006 16:47:40 +0200
changeset 2385 5d895018ef42
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
mercurial-crew-with-dirclash