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

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 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b