Mercurial > hg

annotate tests/test-simplemerge-cmd.out @ 6415:69d1946a1d02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 31 Mar 2008 00:01:27 +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)