Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1279:8ab1c07d4e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add checks for programs which are required for the test suite to run. All prerequisite programs are checked for existance, and if any are missing, a list of missing programs is printed, and the test suite is aborted. All programs currently used in the tests, except those in core-utils, are checked.
author eric@localhost.localdomain
date Mon, 19 Sep 2005 18:24:37 -0700
parents 5a034646e472
children b2ae81a7df29
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 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b