diff tests/test-merge-default @ 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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff