Changes between Version 16 and Version 17 of ticket/0883_MERCATOR_2011_MERGE

Timestamp:

2011-11-07T17:01:21+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0883_MERCATOR_2011_MERGE

@@ -118 +118 @@
 
 {{{
-svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 ./
+svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
+          svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
+          ./
 }}}
 
@@ -374 +376 @@
 == step7. Merge in trunk changes between trunk@2802 and trunk@2855. ==
 
+{{{
+svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
+          svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \
+          ./
+}}}