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 Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 10:52:56 -0800
changeset 2030 8d9ec30d58bc
parent 2019 ced2d3620f95
child 2038 5c4496ed152d
permissions -rw-r--r--
forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.

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