tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 17:00:09 -0800
changeset 2061 5987c1eac2ce
parent 2019 ced2d3620f95
child 2038 5c4496ed152d
permissions -rw-r--r--
support nested repositories. mercurial will not recurse into a subdirectory that contains a .hg directory. it is treated as a separate repository.

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)