Mercurial > hg > pyhgsh
annotate tests/test-merge3.out @ 1738:f293ad87f928
Don't hard-code /tmp in test-ro-message
This makes the test succeed when $TMPDIR is set.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 17 Feb 2006 17:41:18 -0600 |
parents | 5a034646e472 |
children | 91c56c427171 |
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 |
402 | 2 b never committed! |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
|
3 nothing changed |