Mercurial > hg

annotate tests/test-simplemerge-cmd.out @ 6269:ffdf70e74623

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: privatize some functions, unnest some others
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
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)