diff tests/test-merge-revert.out @ 5043:8b1ee1f59b3c

dirstate: improve error message on file/directory clash
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 01 Aug 2007 12:03:10 -0700
parents d2b55e3c4e25
children
line wrap: on
line diff