Mercurial > hg > soundsoftware-site
annotate test/fixtures/diffs/issue-13644-3.diff @ 1519:afce8026aaeb redmine-2.4-integration
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:34:53 +0100 |
parents | 261b3d9a4903 |
children |
rev | line source |
---|---|
Chris@1464 | 1 --- a.txt 2013-07-27 06:03:49.133257759 +0900 |
Chris@1464 | 2 +++ b.txt 2013-07-27 06:03:58.791221118 +0900 |
Chris@1464 | 3 @@ -1,3 +1,3 @@ |
Chris@1464 | 4 aaaa |
Chris@1464 | 5 -日本記 |
Chris@1464 | 6 +日本娘 |
Chris@1464 | 7 bbbb |