Changes between Version 3 and Version 4 of WorkingGroups/TAM/MergingGit
- Timestamp:
- 2009-12-07T11:44:15+01:00 (14 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingGroups/TAM/MergingGit
v3 v4 11 11 git mergetool files.F90 12 12 }}} 13 if you want to remove one of the automatically merged files.F90 from the 'add' list and putting it back to the working directory 14 {{{ 15 git reset HEAD files.F90 16 }}}