| 22 | |
| 23 | step3: merge in dev_MERCATOR_INGV_2011_MERGE INGV branch ( dev_INGV_2011) |
| 24 | |
| 25 | |
| 26 | |
| 27 | {{{ |
| 28 | svn merge svn+ssh://yourlogin@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \ |
| 29 | svn+ssh://yourlogin@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_INGV_2011 \ |
| 30 | dev_MERCATOR_INGV_2011_MERGE |
| 31 | |
| 32 | }}} |
| 33 | |
| 34 | |
| 35 | |
| 36 | {{{ |
| 37 | --- Merging differences between repository URLs into 'dev_MERCATOR_INGV_2011_MERGE': |
| 38 | U dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib |
| 39 | U dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex |
| 40 | U dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex |
| 41 | A dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave |
| 42 | U dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc |
| 43 | A dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf |
| 44 | U dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namzdf_ric |
| 45 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 46 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 47 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 48 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 49 | A dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 |
| 50 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 |
| 51 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 52 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 |
| 53 | A dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 |
| 54 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 |
| 55 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 |
| 56 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 |
| 57 | Password: |
| 58 | Password: |
| 59 | --- Merging r2803 through r3083 into 'dev_MERCATOR_INGV_2011_MERGE': |
| 60 | C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave |
| 61 | C dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf |
| 62 | C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 |
| 63 | G dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90 |
| 64 | G dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 65 | G dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90 |
| 66 | C dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90 |
| 67 | G dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 |
| 68 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 |
| 69 | U dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 |
| 70 | Summary of conflicts: |
| 71 | Tree conflicts: 4 |
| 72 | }}} |
| 73 | |
| 74 | |
| 75 | |