view .svn/pristine/c0/c0a5b910b677dd2973ce573c994f3e7cc596e2ec.svn-base @ 1621:3a510bf6a9bc

Merge from live branch
author Chris Cannam
date Fri, 13 Jul 2018 10:44:33 +0100
parents 261b3d9a4903
children
line wrap: on
line source
--- 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