Mercurial > hg > soundsoftware-site
annotate test/fixtures/diffs/issue-13644-5.diff @ 1621:3a510bf6a9bc
Merge from live branch
author | Chris Cannam |
---|---|
date | Fri, 13 Jul 2018 10:44:33 +0100 |
parents | 261b3d9a4903 |
children |
rev | line source |
---|---|
Chris@1464 | 1 --- a.txt 2013-07-27 05:52:11.415223830 +0900 |
Chris@1464 | 2 +++ b.txt 2013-07-27 05:52:18.249190358 +0900 |
Chris@1464 | 3 @@ -1,3 +1,3 @@ |
Chris@1464 | 4 aaaa |
Chris@1464 | 5 -日本記ok |
Chris@1464 | 6 +日本誘ok |
Chris@1464 | 7 bbbb |