annotate tests/test-merge4.out @ 1447:508a3f559553

revert added and removed files to their normal state before reverting add a test for revert
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 25 Oct 2005 15:51:28 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source