Mercurial > hg

comparison tests/test-merge-revert2 @ 953:52d8d81e72ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Fri, 19 Aug 2005 16:45:25 -0800
parents 01215ad04283 d997148155f2
children 4f81068ed8cd
comparison
equal deleted inserted replaced
948:ffb0665028f0 953:52d8d81e72ad
25 hg status 25 hg status
26 hg id 26 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 | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" 30 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
31 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
31 hg status 32 hg status
32 hg id 33 hg id
33 hg revert 34 hg revert
34 hg diff 35 hg diff
35 hg status 36 hg status