annotate test/fixtures/diffs/issue-13644-2.diff @ 1565:4e21f91ad4ff

Merge from live branch
author Chris Cannam
date Thu, 04 Feb 2016 08:47:09 +0000
parents 261b3d9a4903
children
rev   line source
Chris@1464 1 --- a.txt 2013-04-05 14:19:39.000000000 +0900
Chris@1464 2 +++ b.txt 2013-04-05 14:19:51.000000000 +0900
Chris@1464 3 @@ -1,3 +1,3 @@
Chris@1464 4 aaaa
Chris@1464 5 -日本
Chris@1464 6 +にっぽん日本
Chris@1464 7 bbbb