diff tests/test-merge6.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 9344f5dd4488
children ced2d3620f95
line wrap: on
line diff