source: branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-conflicts.pod @ 5445

Last change on this file since 5445 was 5445, checked in by davestorkey, 5 years ago

Clear SVN keywords from 2015/dev_r5021_UKMO1_CICE_coupling branch.

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.