Changes between Version 3 and Version 4 of ticket/0890_NOC_UKMO_MERGE

Timestamp:

2011-11-14T18:51:50+01:00 (12 years ago)

Author:

acc

Comment:

--

ticket/0890_NOC_UKMO_MERGE

@@ -157 +157 @@
 
 {{{
-svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855           svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_2011_MERGE dev_NOC_UKMO_MERGE
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \
+           svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_2011_MERGE dev_NOC_UKMO_MERGE
  
 --- Merging differences between repository URLs into 'dev_NOC_UKMO_MERGE':
@@ -226 +227 @@
 
 {{{
-svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from the tracer sub-timestepping)"Password: 
+svn ci -m"Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from the tracer sub-timestepping)" 
 Sending        DOC/TexFiles/Biblio/Biblio.bib
                    zdpdy2 = zcoef0 / e2v(ji,jj) * &