~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches_data/diff-7

  • Committer: Benoît Pierre
  • Date: 2008-12-02 21:18:01 UTC
  • mto: (4056.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 4058.
  • Revision ID: benoit.pierre@gmail.com-20081202211801-s5p2rr6k8t0v5dl0
OK, so now patches should handle '\ No newline at end of file' in both
original and patched contents... Resurrect iter_lines_handle_nl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- orig-7      2008-11-30 02:56:58.000000000 +0100
2
 
+++ mod-7       2008-11-30 02:56:35.000000000 +0100
3
 
@@ -1,5 +1 @@
4
 
-# This file is for listing TODOs for branches that are being worked on.
5
 
-# It should ALWAYS be empty in the mainline or in integration branches.
6
 
-# 
7
 
-#
8
 
-
9
 
+arg
 
1
--- orig-7      2008-12-02 01:58:43.000000000 +0100
 
2
+++ mod-7       2008-12-02 01:58:43.000000000 +0100
 
3
@@ -1 +1 @@
 
4
-No terminating newline
 
5
\ No newline at end of file
 
6
+No newline either
10
7
\ No newline at end of file