Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322.out @ 3102:36b08cd92fb7
merge: add codes to action list, eliminate None elements
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 15:24:00 -0500 |
parents | 3d5547845158 |
children | e3dffbdc6522 |
line wrap: on
line source
% file replaced with directory adding a % should fail - would corrupt dirstate abort: file named 'a' already in dirstate % directory replaced with file adding a/a % should fail - would corrupt dirstate abort: directory named 'a' already in dirstate % directory replaced with file adding b/c/d % should fail - would corrupt dirstate abort: directory named 'b' already in dirstate