Mercurial > hg
comparison tests/test-merge-revert2.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 | 93a4e72b4f83 |
children | 5af5f0f9d724 |
comparison
equal
deleted
inserted
replaced
5861:b860b116dea4 | 5863:3d1f9dcecdea |
---|---|
18 hg update 0 | 18 hg update 0 |
19 hg update 1 | 19 hg update 1 |
20 diff -r f248da0d4c3e file1 | 20 diff -r f248da0d4c3e file1 |
21 --- a/file1 | 21 --- a/file1 |
22 +++ b/file1 | 22 +++ b/file1 |
23 @@ -1,3 +1,7 @@ added file1 | 23 @@ -1,3 +1,7 @@ |
24 added file1 | 24 added file1 |
25 another line of text | 25 another line of text |
26 +<<<<<<< my | 26 +<<<<<<< my |
27 +changed file1 different | 27 +changed file1 different |
28 +======= | 28 +======= |