Mercurial > hg
view tests/test-mq-qdiff.out @ 4264:bda63383d529
Make import opportunistically use merge information
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 21 Mar 2007 14:06:25 -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