Mercurial > hg
changeset 3228:403ebd4d92d7
test-merge-revert2 solaris fix
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 02 Oct 2006 08:36:29 +0200 |
| parents | 325278542ea8 |
| children | 7feeb6517d96 |
| files | tests/test-merge-revert2 |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-revert2 Sat Sep 30 21:32:29 2006 -0700 +++ b/tests/test-merge-revert2 Mon Oct 02 08:36:29 2006 +0200 @@ -27,8 +27,7 @@ hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -#hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" -hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert --no-backup --all