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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 17 Feb 2006 17:41:18 -0600
changeset 1738 f293ad87f928
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)
mercurial-crew-with-dirclash