annotate tests/test-simplemerge-cmd.out @ 5357:4ad2a18aff42

convert: fix a few residual bugs in darcs importer
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 02 Oct 2007 21:00:38 -0700
parents ea7b982b6c08
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5115
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4360
diff changeset
1 (binary:application/octet-stream)