Changes between Version 11 and Version 12 of ticket/0883_MERCATOR_2011_MERGE

Timestamp:

2011-11-07T16:00:51+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0883_MERCATOR_2011_MERGE

@@ -235 +235 @@
 
 
-'''step5: add changes from  dev_r2802_MERCATOR9_floats'''
+'''step6: add changes from  dev_r2802_MERCATOR9_floats'''
 
 {{{
@@ -242 +242 @@
           dev_MERCATOR_2011_MERGE
 }}}
+
+
+
+
+{{{
+--- Merging r2835 through r3050 into 'dev_MERCATOR_2011_MERGE':
+U    dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex
+U    dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namflo
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90
+A    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90
+U    dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90
+Summary of conflicts:
+  Text conflicts: 1
+}}}
+
+
+
+
+