Mercurial > hg-stable

diff tests/test-merge-revert2.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 93a4e72b4f83
children 5af5f0f9d724
line wrap: on
line diff
--- a/tests/test-merge-revert2.out	Tue Jan 15 15:49:24 2008 -0600
+++ b/tests/test-merge-revert2.out	Wed Jan 16 11:14:24 2008 -0600
@@ -20,7 +20,7 @@
 diff -r f248da0d4c3e file1
 --- a/file1
 +++ b/file1
-@@ -1,3 +1,7 @@ added file1
+@@ -1,3 +1,7 @@
  added file1
  another line of text
 +<<<<<<< my