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 Bryan O'Sullivan <bos@serpentine.com>
Wed, 21 Sep 2005 15:18:24 -0700
changeset 1301 0e921c164b58
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix small thinko.

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