fcm-conflicts.pod 363 B

1234567891011121314151617
  1. =head1 NAME
  2. fcm conflicts (cf)
  3. =head1 SYNOPSIS
  4. Use graphical tool to resolve any conflicts within your working copy.
  5. fcm conflicts [PATH]
  6. =head1 ARGUMENTS
  7. Invoke a graphical merge tool to help you resolve conflicts in your working copy
  8. at PATH. It prompts you to run "L<svn|svn> resolved" each time you have resolved
  9. the conflicts in a text file.
  10. =cut