Mercurial > hg-stable

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 840e2b315c1f
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-merge1.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-merge1.out	Wed Jan 16 11:14:24 2008 -0600
@@ -34,7 +34,7 @@
 diff -r c1dd73cbf59f b
 --- a/b
 +++ b/b
-@@ -1,1 +1,1 @@ This is file b1
+@@ -1,1 +1,1 @@
 -This is file b1
 +This is file b22
 M b
@@ -49,7 +49,7 @@
 diff -r c1dd73cbf59f b
 --- a/b
 +++ b/b
-@@ -1,1 +1,1 @@ This is file b1
+@@ -1,1 +1,1 @@
 -This is file b1
 +This is file b33
 M b