##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-merge-revert2 solaris fix
Benoit Boissinot -
r3228:403ebd4d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -27,8 +27,7 b' hg id'
27 hg update -C 0
27 hg update -C 0
28 echo "changed file1 different" >> file1
28 echo "changed file1 different" >> file1
29 HGMERGE=merge hg update
29 HGMERGE=merge hg update
30 #hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
30 hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
31 hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
32 hg status
31 hg status
33 hg id
32 hg id
34 hg revert --no-backup --all
33 hg revert --no-backup --all
General Comments 0
You need to be logged in to leave comments. Login now