Mercurial > hg > soundsoftware-site

view .svn/pristine/4d/4dfa42e1015d78dacb86fd8ca51a98e09e60e632.svn-base @ 1528:5047f066734d live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge failure in de.yml
author Chris Cannam
date Fri, 26 Sep 2014 10:18:42 +0100
parents 261b3d9a4903
children
line wrap: on
line source
--- a.txt	2013-04-05 14:19:39.000000000 +0900
+++ b.txt	2013-04-05 14:19:51.000000000 +0900
@@ -1,3 +1,3 @@
 aaaa
-日本
+にっぽん日本
 bbbb