annotate tests/test-simplemerge-cmd.out @ 5556:61fdf2558c0a

convert: some tidyups, doc improvements, and test fixes The various back end options are now documented. The hg source can now be configured not to hand out a revision ID.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 27 Nov 2007 09:44:09 -0800
parents ea7b982b6c08
children e1f4343db740
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5081
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4364
diff changeset
1 (binary:application/octet-stream)