Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 5212:b772c0b9f0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 12:24:54 -0700
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)