Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 5347:9c0f864fddca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Sep 2007 12:36:11 +0200
parents ea7b982b6c08
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5115
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4360
diff changeset
1 (binary:application/octet-stream)