Mercurial > hg
view tests/test-merge6.out @ 949:d997148155f2
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Thu, 18 Aug 2005 13:33:39 +0100 |
parents | 5a034646e472 |
children | 5007e0bdeed2 |
line wrap: on
line source
pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) bar should remain deleted. 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) bar should remain deleted. 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo