tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 18 Aug 2006 21:03:29 -0700
changeset 2953 3d5547845158
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix issue 322. do not allow to add files that shadow files or directories already in dirstate.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)