Mercurial > hg

diff tests/test-merge10.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 59b8f9361545
children 0750f11152fe
line wrap: on
line diff
--- a/tests/test-merge10.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-merge10.out	Wed Jan 16 11:14:24 2008 -0600
@@ -14,6 +14,6 @@
 diff -r d02b3fc32762 testdir/subdir/a
 --- a/testdir/subdir/a
 +++ b/testdir/subdir/a
-@@ -1,1 +1,1 @@ a
+@@ -1,1 +1,1 @@
 -a
 +alpha