tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Fri, 07 Nov 2008 16:28:52 -0600
changeset 7343 e47dab64be8d
parent 5081 ea7b982b6c08
child 8446 e1f4343db740
permissions -rw-r--r--
run-tests: allow turning off diff display
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5081
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4364
diff changeset
     1
(binary:application/octet-stream)