tests/test-merge-revert.out
author TK Soh <teekaysoh@yahoo.com>
Thu, 18 Aug 2005 13:33:39 +0100
changeset 949 d997148155f2
parent 925 5a034646e472
child 1933 7544700fd931
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.

1:3aa14bbc23d9
0:8633637036c1
3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip