source:
LMDZ6/branches/Amaury_dev/tools/fcm/lib/FCM/CLI/fcm-conflicts.pod
@
5521
| Last change on this file since 5521 was 5129, checked in by , 7 months ago | |
|---|---|
| File size: 363 bytes | |
| Line | |
|---|---|
| 1 | =head1 NAME |
| 2 | |
| 3 | fcm conflicts (cf) |
| 4 | |
| 5 | =head1 SYNOPSIS |
| 6 | |
| 7 | Use graphical tool to resolve any conflicts within your working copy. |
| 8 | |
| 9 | fcm conflicts [PATH] |
| 10 | |
| 11 | =head1 ARGUMENTS |
| 12 | |
| 13 | Invoke a graphical merge tool to help you resolve conflicts in your working copy |
| 14 | at PATH. It prompts you to run "L<svn|svn> resolved" each time you have resolved |
| 15 | the conflicts in a text file. |
| 16 | |
| 17 | =cut |
Note: See TracBrowser
for help on using the repository browser.
