This document is a Mac OS X manual page. Manual pages are a command-line technology for providing documentation. You can view these manual pages locally using the man(1) command. These manual pages come from many different sources, and thus, have a variety of writing styles.

For more information about the manual page format, see the manual page for manpages(5).

SVK::Resolve(3)                      User Contributed Perl Documentation                     SVK::Resolve(3)



NAME
       SVK::Resolve - Interactively resolve conflicts

DESCRIPTION
         Accept:
            a   : Accept the merged/edited file.
            y   : Keep only changes to your file.
            t   : Keep only changes to their file.
         Diff:
            d   : Diff your file against merged file.
            dm  : See merged changes.
            dy  : See your changes alone.
            dt  : See their changes alone.
         Edit:
            e   : Edit merged file with an editor.
            m   : Run an external merge tool to edit merged file.
         Misc:
            s   : Skip this file.
            h   : Print this help message.

         Environment variables:
           EDITOR     : Editor to use for 'e'.
           SVKMERGE   : External merge tool to always use for 'm'.
           SVKRESOLVE : The resolve action to take, instead of asking.



perl v5.8.8                                      2006-12-28                                  SVK::Resolve(3)