Mercurial > hg
view tests/test-issue322.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
author | timeless <timeless@gmail.com> |
---|---|
date | Fri, 30 Jul 2010 10:32:24 +0300 |
parents | e3dffbdc6522 |
children |
line wrap: on
line source
% file replaced with directory adding a % should fail - would corrupt dirstate abort: file 'a' in dirstate clashes with 'a/a' % directory replaced with file adding a/a % should fail - would corrupt dirstate abort: directory 'a' already in dirstate % directory replaced with file adding b/c/d % should fail - would corrupt dirstate abort: directory 'b' already in dirstate