tests/test-simplemerge-cmd.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Feb 2008 18:38:54 -0200
changeset 6062 3c3b126e5619
parent 5081 ea7b982b6c08
child 8446 e1f4343db740
permissions -rw-r--r--
Make files in .hg inherit the permissions from .hg/store
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)