diff tests/test-merge7.out @ 1513:5c3b93b244aa

copy & rename don't overwrite unless --force is specified
author Robin Farine <robin.farine@terminus.org>
date Tue, 08 Nov 2005 10:35:09 -0800
parents bf6c91cb816f
children 6d50d6189269
line wrap: on
line diff