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.
fcm-conflicts.pod in branches/NERC/dev_r5518_NOC_unchanged/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI – NEMO

source: branches/NERC/dev_r5518_NOC_unchanged/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-conflicts.pod @ 6240

Last change on this file since 6240 was 6240, checked in by jpalmier, 8 years ago

JPALM -- 13-01-2016 -- clean svn_key

File size: 363 bytes
Line 
1=head1 NAME
2
3fcm conflicts (cf)
4
5=head1 SYNOPSIS
6
7Use graphical tool to resolve any conflicts within your working copy.
8
9    fcm conflicts [PATH]
10
11=head1 ARGUMENTS
12
13Invoke a graphical merge tool to help you resolve conflicts in your working copy
14at PATH. It prompts you to run "L<svn|svn> resolved" each time you have resolved
15the conflicts in a text file.
16
17=cut
Note: See TracBrowser for help on using the repository browser.