Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 1159:b6f5a947e62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object. Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing), people should make sure they write strings.
author Vincent Wagelaar <vincent@ricardis.tudelft.nl>
date Tue, 30 Aug 2005 10:57:52 +0200
parents 5a034646e472
children 91c56c427171
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
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2 b never committed!
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
3 nothing changed