annotate .svn/pristine/e8/e8156cbfcfa0fa6ab4307cda904eab715c8b0db0.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents 038ba2d95de8
children
rev   line source
Chris@1296 1 # HG changeset patch
Chris@1296 2 # User test
Chris@1296 3 # Date 1348014182 -32400
Chris@1296 4 # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
Chris@1296 5 # Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e
Chris@1296 6 modify test1.txt
Chris@1296 7
Chris@1296 8 diff -r 180b6605936c -r d1c871b8ef11 test1.txt
Chris@1296 9 --- a/test1.txt
Chris@1296 10 +++ b/test1.txt
Chris@1296 11 @@ -1,1 +1,1 @@
Chris@1296 12 -test1
Chris@1296 13 +modify test1