Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-diffdir @ 1729:ace6d26f78f1
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 15 Feb 2006 10:40:15 -0800 |
parents | fde8fb2cbede |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1728:9b92b71d5dd7 | 1729:ace6d26f78f1 |
---|---|
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/" |