diff tests/test-mq-qrefresh.out @ 5863:3d1f9dcecdea

diff: don't show function name by default We'd mistakenly made the -p option always on, which meant there was no way to turn it off. It also meant that we were sometimes splitting multibyte characters in function name, which isn't a good default.
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Jan 2008 11:14:24 -0600
parents f01efb4bc258
children 71e339714586
line wrap: on
line diff
--- a/tests/test-mq-qrefresh.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-mq-qrefresh.out	Wed Jan 16 11:14:24 2008 -0600
@@ -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