Mercurial > hg
view tests/test-mq-qdiff.out @ 5046:ed68c8c31c9a
Automated merge with http://hg.intevation.org/mercurial/crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 01 Aug 2007 12:03:50 -0700 |
parents | 8ca608c1eb02 |
children | 3d1f9dcecdea |
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