Mercurial > hg

annotate tests/test-simplemerge-cmd.out @ 7138:0df098871e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-permission: put sane permissions at the end of the test If we don't do that, we won't delete all directories at the end of the test
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 18 Oct 2008 20:47:47 +0200
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)