Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge6.out
author TK Soh <teekaysoh@yahoo.com>
Thu, 18 Aug 2005 13:33:39 +0100
changeset 949 d997148155f2
parent 925 5a034646e472
child 990 5007e0bdeed2
permissions -rw-r--r--
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.

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
mercurial-crew-with-dirclash