Mercurial > hg

annotate tests/test-merge3.out @ 3345:a09be4317f9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui.py: use the overlay to hold --config data This allows the ui class to know that these items have a higher priority without further help from commands.py.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 10 Oct 2006 18:43:20 -0300
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