Merged r12046 from trunk to 2.3-stable (#14562)

fix diff of CJK (Chinese/Japanese/Korean) is broken on Ruby 1.8. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 12:53:51 +00:00
parent b724eb4fec
commit bbf3ffe0aa
5 changed files with 80 additions and 3 deletions
@@ -0,0 +1,7 @@
+--- a.txt	2013-07-27 06:03:49.133257759 +0900
+++ b.txt	2013-07-27 06:03:58.791221118 +0900
+@@ -1,3 +1,3 @@
+ aaaa
+-日本記
+日本娘
+ bbbb