Mercurial > hg > soundsoftware-site
annotate .svn/pristine/e8/e8156cbfcfa0fa6ab4307cda904eab715c8b0db0.svn-base @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
| author | Chris Cannam |
|---|---|
| date | Fri, 14 Jun 2013 09:28:30 +0100 |
| parents | 622f24f53b42 |
| children |
| rev | line source |
|---|---|
| Chris@1295 | 1 # HG changeset patch |
| Chris@1295 | 2 # User test |
| Chris@1295 | 3 # Date 1348014182 -32400 |
| Chris@1295 | 4 # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f |
| Chris@1295 | 5 # Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e |
| Chris@1295 | 6 modify test1.txt |
| Chris@1295 | 7 |
| Chris@1295 | 8 diff -r 180b6605936c -r d1c871b8ef11 test1.txt |
| Chris@1295 | 9 --- a/test1.txt |
| Chris@1295 | 10 +++ b/test1.txt |
| Chris@1295 | 11 @@ -1,1 +1,1 @@ |
| Chris@1295 | 12 -test1 |
| Chris@1295 | 13 +modify test1 |