Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322.out @ 3620:3109f012c305
Clarify untracked file merge message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Nov 2006 21:47:55 -0600 |
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