Mercurial > hg
diff tests/test-mq-qrefresh.out @ 6042:2da5b19a6460
Merge with crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 06 Feb 2008 19:57:52 -0800 |
parents | 3d1f9dcecdea |
children | 71e339714586 |
line wrap: on
line diff
--- a/tests/test-mq-qrefresh.out Thu Jul 26 07:56:27 2007 -0400 +++ b/tests/test-mq-qrefresh.out Wed Feb 06 19:57:52 2008 -0800 @@ -8,26 +8,26 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % patch file contents @@ -36,13 +36,13 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qrefresh 1 @@ -50,26 +50,26 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % patch file contents @@ -78,7 +78,7 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qrefresh . in subdir @@ -86,26 +86,26 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % patch file contents @@ -114,7 +114,7 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qrefresh in hg-root again @@ -122,26 +122,26 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched % patch file contents @@ -150,12 +150,12 @@ diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base -@@ -1,1 +1,1 @@ base +@@ -1,1 +1,1 @@ -base +patched