Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qdiff.out @ 5215:b0bc8cf41ffc
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 24 Aug 2007 00:39:16 +0200 |
parents | 8ca608c1eb02 |
children |
line wrap: on
line source
% init % commit adding base % qnew mqbase % qrefresh % qdiff diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ base -base +patched % qdiff dirname diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ base -base +patched