annotate tests/test-simplemerge-cmd.out @ 5960:06467b51ab9c

webcommands: add missing hg import
author Patrick Mezard <pmezard@gmail.com>
date Sat, 26 Jan 2008 22:44:27 +0100
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)