diff tests/test-permissions @ 5204:6a1d2dd96b8e

abort when adding a file in merged state
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 21 Aug 2007 02:02:08 +0200
parents c0b449154a90
children 551958d5082c
line wrap: on
line diff