Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 1422:a7e8408ac79c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py2exe is not able to handle win32com.shell Changes: - setup.py: help py2exe finding the shell module in win32com.shell
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Mon, 24 Oct 2005 14:52:41 -0700
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