Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 4566:9b3a818adae6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Wed, 13 Jun 2007 15:02:09 +0300
parents b2ae81a7df29
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
3 adding b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
5 adding b