New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
WorkingGroups/TAM/MergingGit (diff) – NEMO

Changes between Version 3 and Version 4 of WorkingGroups/TAM/MergingGit


Ignore:
Timestamp:
2009-12-07T11:44:15+01:00 (14 years ago)
Author:
avidard
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingGroups/TAM/MergingGit

    v3 v4  
    1111git mergetool files.F90 
    1212}}} 
     13if you want to remove one of the automatically merged files.F90 from the 'add' list and putting it back to the working directory 
     14{{{ 
     15git reset HEAD files.F90 
     16}}}