Mercurial > hg

annotate tests/test-simplemerge-cmd.out @ 7330:781af9bb9684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test output for updated gitdiffs help and web template cleanups
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Nov 2008 13:08:34 +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)