Mercurial > hg > pyhgsh

annotate tests/test-merge3.out @ 2095:0bf2a9e5eff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Apr 2006 11:41:22 -0700
parents 91c56c427171
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed