Mercurial > hg
comparison tests/test-up-local-change.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 | 17ed9b9a0d03 |
children | 5af5f0f9d724 |
comparison
equal
deleted
inserted
replaced
5861:b860b116dea4 | 5863:3d1f9dcecdea |
---|---|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 diff -r 33aaa84a386b a | 4 diff -r 33aaa84a386b a |
5 --- a/a | 5 --- a/a |
6 +++ b/a | 6 +++ b/a |
7 @@ -1,1 +1,1 @@ a | 7 @@ -1,1 +1,1 @@ |
8 -a | 8 -a |
9 +abc | 9 +abc |
10 adding b | 10 adding b |
11 M a | 11 M a |
12 changeset: 0:33aaa84a386b | 12 changeset: 0:33aaa84a386b |
86 | 86 |
87 | 87 |
88 diff -r 802f095af299 a | 88 diff -r 802f095af299 a |
89 --- a/a | 89 --- a/a |
90 +++ b/a | 90 +++ b/a |
91 @@ -1,1 +1,1 @@ a2 | 91 @@ -1,1 +1,1 @@ |
92 -a2 | 92 -a2 |
93 +abc | 93 +abc |
94 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 94 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
95 adding b | 95 adding b |
96 M a | 96 M a |
128 summary: 3 | 128 summary: 3 |
129 | 129 |
130 diff -r 802f095af299 a | 130 diff -r 802f095af299 a |
131 --- a/a | 131 --- a/a |
132 +++ b/a | 132 +++ b/a |
133 @@ -1,1 +1,1 @@ a2 | 133 @@ -1,1 +1,1 @@ |
134 -a2 | 134 -a2 |
135 +abc | 135 +abc |
136 adding a | 136 adding a |
137 pulling from ../a | 137 pulling from ../a |
138 requesting all changes | 138 requesting all changes |