Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-diffdir @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 6592c4f5cd4f |
children | ec85f9e6f3b1 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
5 hg add a | 5 hg add a |
6 hg ci -m "a" -d "0 0" | 6 hg ci -m "a" -d "0 0" |
7 | 7 |
8 echo 123 > b | 8 echo 123 > b |
9 hg add b | 9 hg add b |
10 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" | 10 hg diff | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" |
11 | 11 |
12 hg diff -r tip | sed "s/\(\(---\|+++\).*\)\t.*/\1/" | 12 hg diff -r tip | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" |