equal
deleted
inserted
replaced
1 #!/bin/sh -x |
1 #!/bin/sh |
2 |
2 |
3 mkdir t |
3 mkdir t |
4 cd t |
4 cd t |
5 hg init |
5 hg init |
6 echo "added file1" > file1 |
6 echo "added file1" > file1 |
24 hg status |
24 hg status |
25 hg id |
25 hg id |
26 hg update -C 0 |
26 hg update -C 0 |
27 echo "changed file1 different" >> file1 |
27 echo "changed file1 different" >> file1 |
28 HGMERGE=merge hg update |
28 HGMERGE=merge hg update |
29 hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" |
29 hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" |
30 hg status |
30 hg status |
31 hg id |
31 hg id |
32 hg revert |
32 hg revert |
33 hg diff |
33 hg diff |
34 hg status |
34 hg status |