Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert2 @ 800:ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 29 Jul 2005 15:19:43 +0100 |
| parents | 49ec802b4a16 |
| children | 69db1e34378b |
line wrap: on
line diff
--- a/tests/test-merge-revert2 +++ b/tests/test-merge-revert2 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t @@ -26,7 +26,7 @@ hg id hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" hg status hg id hg revert