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.

mercurial/mdiff.py

@@ -30,7 +30,7 b' class diffopts(object):'
     defaults = {
         'context': 3,
         'text': False,
-        'showfunc': True,
+        'showfunc': False,
         'git': False,
         'nodates': False,
         'ignorews': False,

tests/test-diff-hashes.out

@@ -3,7 +3,7 b' not: No such file or directory'
 quiet:
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@ bar
+@@ -1,1 +1,1 @@
 -bar
 +foobar
 
@@ -11,7 +11,7 b' normal:'
 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@ bar
+@@ -1,1 +1,1 @@
 -bar
 +foobar
 
@@ -19,7 +19,7 b' verbose:'
 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@ bar
+@@ -1,1 +1,1 @@
 -bar
 +foobar
 
@@ -27,7 +27,7 b' debug:'
 diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@ bar
+@@ -1,1 +1,1 @@
 -bar
 +foobar
 

tests/test-diff-ignore-whitespace.out

@@ -4,7 +4,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 +
  hello world
 +
@@ -14,7 +14,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 +
  hello world
 +
@@ -28,7 +28,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +	 hello world
  goodbye world
@@ -36,7 +36,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +	 hello world
  goodbye world
@@ -44,7 +44,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +	 hello world
  goodbye world
@@ -52,7 +52,7 b' hg diff -Bb'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +	 hello world
  goodbye world
@@ -61,7 +61,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +hello world	 
  goodbye world
@@ -69,7 +69,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 +hello world	 
  goodbye world
@@ -81,7 +81,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +good bye world
@@ -89,7 +89,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +good bye world
@@ -97,7 +97,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +good bye world
@@ -105,7 +105,7 b' hg diff -Bb'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +good bye world
@@ -114,7 +114,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +goodbye		  	world
@@ -122,7 +122,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
  hello world
 -goodbye world
 +goodbye		  	world
@@ -134,7 +134,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
  hello world
 + 	
  goodbye world
@@ -142,7 +142,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
  hello world
 + 	
  goodbye world
@@ -150,7 +150,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
  hello world
 + 	
  goodbye world
@@ -160,7 +160,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
 -hello world
 -goodbye world
 +hello  world
@@ -170,7 +170,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
 -hello world
 -goodbye world
 +hello  world
@@ -180,7 +180,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
+@@ -1,2 +1,3 @@
 -hello world
 -goodbye world
 +hello  world
@@ -192,7 +192,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 -goodbye world
 +helloworld
@@ -201,7 +201,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 -goodbye world
 +helloworld
@@ -210,7 +210,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 -goodbye world
 +helloworld
@@ -219,7 +219,7 b' hg diff -Bb'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,2 @@ hello world
+@@ -1,2 +1,2 @@
 -hello world
 -goodbye world
 +helloworld
@@ -230,7 +230,7 b' hg diff'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 -hello world
 -goodbye world
 +helloworld
@@ -242,7 +242,7 b' hg diff -B'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 -hello world
 -goodbye world
 +helloworld
@@ -254,7 +254,7 b' hg diff -b'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 -hello world
 -goodbye world
 +helloworld
@@ -266,7 +266,7 b' hg diff -Bb'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 -hello world
 -goodbye world
 +helloworld
@@ -278,7 +278,7 b' hg diff -w'
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,5 @@ hello world
+@@ -1,2 +1,5 @@
 -hello world
 -goodbye world
 +helloworld

tests/test-diff-newlines.out

@@ -2,7 +2,7 b' adding a'
 diff -r 107ba6f817b5 -r 310ce7989cdc a
 --- a/a	Thu Jan 01 00:00:01 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
-@@ -1,2 +1,3 @@ confuse str.splitlines
+@@ -1,2 +1,3 @@
  confuse str.splitlines
  embedded
newline
 +clean diff

tests/test-git-export.out

@@ -35,7 +35,7 b' rename from src'
 rename to dst
 --- a/src
 +++ b/dst
-@@ -3,3 +3,4 @@ 3
+@@ -3,3 +3,4 @@
  3
  4
  5
@@ -86,7 +86,7 b' rename from foo'
 rename to bar
 --- a/foo
 +++ b/bar
-@@ -1,2 +1,3 @@ a
+@@ -1,2 +1,3 @@
  a
  b
 +c
@@ -96,7 +96,7 b' rename from bar'
 rename to foo
 --- a/bar
 +++ b/foo
-@@ -1,3 +1,2 @@ a
+@@ -1,3 +1,2 @@
  a
  b
 -c
@@ -107,7 +107,7 b' rename from foo'
 rename to bar
 --- a/foo
 +++ b/bar
-@@ -1,1 +1,3 @@ a
+@@ -1,1 +1,3 @@
  a
 +b
 +c
@@ -117,7 +117,7 b' rename from bar'
 rename to foo
 --- a/bar
 +++ b/foo
-@@ -1,3 +1,1 @@ a
+@@ -1,3 +1,1 @@
  a
 -b
 -c

tests/test-merge-revert2.out

@@ -20,7 +20,7 b' You can redo the full merge using:'
 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

tests/test-merge1.out

@@ -34,7 +34,7 b' 1 files updated, 0 files merged, 0 files'
 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 b' 0 files updated, 1 files merged, 0 files'
 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

tests/test-merge10.out

@@ -14,6 +14,6 b' M testdir/subdir/a'
 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

tests/test-mq-missingfiles.out

@@ -13,13 +13,13 b' c'
 % display rejections
 --- b
 +++ b
-@@ -1,3 +1,5 @@ a
+@@ -1,3 +1,5 @@
 +b
 +b
  a
  a
  a
-@@ -8,3 +10,5 @@ a
+@@ -8,3 +10,5 @@
  a
  a
  a

tests/test-mq-qdiff.out

@@ -7,13 +7,13 b' adding base'
 diff -r 67e992f2c4f3 base
 --- a/base
 +++ b/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r 67e992f2c4f3 base
 --- a/base
 +++ b/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched

tests/test-mq-qrefresh.out

@@ -8,26 +8,26 b' adding 2/base'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
@@ -36,13 +36,13 b' mqbase'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh 1
@@ -50,26 +50,26 b' diff -r b55ecdccb5cf 2/base'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
@@ -78,7 +78,7 b' mqbase'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh . in subdir
@@ -86,26 +86,26 b' diff -r b55ecdccb5cf 1/base'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
@@ -114,7 +114,7 b' mqbase'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh in hg-root again
@@ -122,26 +122,26 b' diff -r b55ecdccb5cf 1/base'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
@@ -150,12 +150,12 b' mqbase'
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
-@@ -1,1 +1,1 @@ base
+@@ -1,1 +1,1 @@
 -base
 +patched

tests/test-mq.out

@@ -99,7 +99,7 b' foo bar'
 diff -r  xa
 --- a/a
 +++ b/a
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 % empty qrefresh
@@ -110,7 +110,7 b' foo bar'
 working dir diff:
 --- a/a
 +++ b/a
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 % qpop
@@ -249,7 +249,7 b' foo'
 diff -r cb9a9f314b8b a
 --- a/a
 +++ b/a
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 diff -r cb9a9f314b8b b/f

tests/test-notify.out

@@ -30,7 +30,7 b' diffs (6 lines):'
 diff -r cb9a9f314b8b -r 0647d048b600 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 (run 'hg update' to get a working copy)
@@ -60,7 +60,7 b' diffs (6 lines):'
 diff -r cb9a9f314b8b -r 0647d048b600 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 (run 'hg update' to get a working copy)

tests/test-permissions.out

@@ -17,6 +17,6 b' commit failed'
 diff -r c1fab96507ef a
 --- a/a
 +++ b/a
-@@ -1,1 +1,1 @@ foo
+@@ -1,1 +1,1 @@
 -foo
 +barber

tests/test-record.out

@@ -179,7 +179,7 b' diff -r 699cc1bea9aa -r 118ed744216b pla'
 % modify end of plain file
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@ 8
+examine changes to 'plain'? [Ynsfdaq?]  @@ -8,3 +8,4 @@
  8
  9
  10
@@ -187,7 +187,7 b" examine changes to 'plain'? [Ynsfdaq?] "
 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, no EOL
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@ 9
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,4 @@
  9
  10
  11
@@ -196,7 +196,7 b" examine changes to 'plain'? [Ynsfdaq?] "
 record this change to 'plain'? [Ynsfdaq?]  % modify end of plain file, add EOL
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@ 9
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,4 +9,4 @@
  9
  10
  11
@@ -206,13 +206,13 b" examine changes to 'plain'? [Ynsfdaq?] "
 record this change to 'plain'? [Ynsfdaq?]  % modify beginning, trim end, record both
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@ 1
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
-record this change to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@ 8
+record this change to 'plain'? [Ynsfdaq?]  @@ -8,5 +8,3 @@
  8
  9
  10
@@ -228,13 +228,13 b' summary: begin-and-end'
 diff -r e2ecd9b0b78d -r d09ab1967dab plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
-@@ -1,4 +1,4 @@ 1
+@@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
-@@ -8,5 +8,3 @@ 8
+@@ -8,5 +8,3 @@
  8
  9
  10
@@ -245,7 +245,7 b' diff -r e2ecd9b0b78d -r d09ab1967dab pla'
 % record end
 diff --git a/plain b/plain
 2 hunks, 5 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@ 2
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,9 +1,6 @@
 -2
 -2
 -3
@@ -274,7 +274,7 b' summary: end-only'
 diff -r d09ab1967dab -r 44516c9708ae plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
-@@ -7,4 +7,4 @@ 7
+@@ -7,4 +7,4 @@
  7
  8
  9
@@ -284,7 +284,7 b' diff -r d09ab1967dab -r 44516c9708ae pla'
 % record beginning
 diff --git a/plain b/plain
 1 hunks, 3 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@ 2
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,3 @@
 -2
 -2
 -3
@@ -301,7 +301,7 b' summary: begin-only'
 diff -r 44516c9708ae -r 3ebbace64a8d plain
 --- a/plain	Thu Jan 01 00:00:11 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
-@@ -1,6 +1,3 @@ 2
+@@ -1,6 +1,3 @@
 -2
 -2
 -3
@@ -313,7 +313,7 b' diff -r 44516c9708ae -r 3ebbace64a8d pla'
 % record end
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@ 4
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,6 +1,9 @@
 +1
 +2
 +3
@@ -335,7 +335,7 b" record this change to 'plain'? [Ynsfdaq?"
 % record beginning, middle
 diff --git a/plain b/plain
 3 hunks, 7 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@ 4
+examine changes to 'plain'? [Ynsfdaq?]  @@ -1,2 +1,5 @@
 +1
 +2
 +3
@@ -367,7 +367,7 b' summary: middle-only'
 diff -r efc0dad7bd9f -r c1c639d8b268 plain
 --- a/plain	Thu Jan 01 00:00:13 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
-@@ -1,5 +1,10 @@ 4
+@@ -1,5 +1,10 @@
 +1
 +2
 +3
@@ -382,7 +382,7 b' diff -r efc0dad7bd9f -r c1c639d8b268 pla'
 % record end
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
-examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@ 7
+examine changes to 'plain'? [Ynsfdaq?]  @@ -9,3 +9,5 @@
  7
  8
  9
@@ -398,7 +398,7 b' summary: end-only'
 diff -r c1c639d8b268 -r 80b74bbc7808 plain
 --- a/plain	Thu Jan 01 00:00:14 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
-@@ -9,3 +9,5 @@ 7
+@@ -9,3 +9,5 @@
  7
  8
  9
@@ -408,7 +408,7 b' diff -r c1c639d8b268 -r 80b74bbc7808 pla'
 adding subdir/a
 diff --git a/subdir/a b/subdir/a
 1 hunks, 1 lines changed
-examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@ a
+examine changes to 'subdir/a'? [Ynsfdaq?]  @@ -1,1 +1,2 @@
  a
 +a
 record this change to 'subdir/a'? [Ynsfdaq?]  
@@ -421,7 +421,7 b' summary: subdir-change'
 diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a
 --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 
@@ -470,7 +470,7 b' summary: x'
 diff -r f9e855cd9374 -r 094183e04b7c subdir/f2
 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
-@@ -1,1 +1,2 @@ b
+@@ -1,1 +1,2 @@
  b
 +b
 
@@ -487,7 +487,7 b' summary: y'
 diff -r 094183e04b7c -r 38164785b0ef subdir/f1
 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
-@@ -1,1 +1,2 @@ a
+@@ -1,1 +1,2 @@
  a
 +a
 

tests/test-up-local-change.out

@@ -4,7 +4,7 b' 0 files updated, 0 files merged, 0 files'
 diff -r 33aaa84a386b a
 --- a/a
 +++ b/a
-@@ -1,1 +1,1 @@ a
+@@ -1,1 +1,1 @@
 -a
 +abc
 adding b
@@ -88,7 +88,7 b' 1'
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
-@@ -1,1 +1,1 @@ a2
+@@ -1,1 +1,1 @@
 -a2
 +abc
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -130,7 +130,7 b' summary: 3'
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
-@@ -1,1 +1,1 @@ a2
+@@ -1,1 +1,1 @@
 -a2
 +abc
 adding a