Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-diffdir @ 1725:49004ad10cde
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 15 Feb 2006 22:37:28 +0100 |
parents | fde8fb2cbede |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1724:5a36609f73a7 | 1725:49004ad10cde |
---|---|
10 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | 10 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
11 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | 11 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
12 | 12 |
13 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | 13 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
14 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | 14 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
15 | |
16 echo foo > a | |
17 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
18 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |