Mercurial > hg > soundsoftware-site

diff .svn/pristine/e8/e8156cbfcfa0fa6ab4307cda904eab715c8b0db0.svn-base @ 1338:25603efa57b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from live branch
author Chris Cannam
date Thu, 20 Jun 2013 13:14:14 +0100
parents 038ba2d95de8
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/e8/e8156cbfcfa0fa6ab4307cda904eab715c8b0db0.svn-base	Thu Jun 20 13:14:14 2013 +0100
@@ -0,0 +1,13 @@
+# HG changeset patch
+# User test
+# Date 1348014182 -32400
+# Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
+# Parent  180b6605936cdc7909c5f08b59746ec1a7c99b3e
+modify test1.txt
+
+diff -r 180b6605936c -r d1c871b8ef11 test1.txt
+--- a/test1.txt
++++ b/test1.txt
+@@ -1,1 +1,1 @@
+-test1
++modify test1