Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
--- a/tests/test-diffdir +++ b/tests/test-diffdir @@ -12,3 +12,7 @@ hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.- hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo foo > a +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"