SVK::Resolve.3pm

Langue: en

Autres versions - même langue

Version: 2008-08-04 (fedora - 04/07/09)

Section: 3 (Bibliothèques de fonctions)

Sommaire

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.