tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Wed, 15 Aug 2007 16:09:50 -0500
changeset 5182 012dbf88b9b2
parent 5115 ea7b982b6c08
permissions -rw-r--r--
remove unneeded imports of mdiff
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5115
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4360
diff changeset
     1
(binary:application/octet-stream)