Mercurial > hg > soundsoftware-site

annotate test/fixtures/diffs/issue-13644-5.diff @ 1485:c8d3ad483bea redmine-2.4-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
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