Merged r11706 and r11707 from trunk to 2.3-stable (#13644)

fix diff error in case of line_left out of range. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-05 09:56:14 +00:00
parent bd5b7428d8
commit 655c50849d
4 changed files with 86 additions and 4 deletions
@@ -0,0 +1,7 @@
+--- a.txt	2013-04-05 14:19:39.000000000 +0900
+++ b.txt	2013-04-05 14:19:51.000000000 +0900
+@@ -1,3 +1,3 @@
+ aaaa
+-日本
+にっぽん日本
+ bbbb