Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2061:5987c1eac2ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support nested repositories. mercurial will not recurse into a subdirectory that contains a .hg directory. it is treated as a separate repository.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 31 Mar 2006 17:00:09 -0800
parents ced2d3620f95
children 5c4496ed152d
line wrap: on
line source

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)