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.10.0 2008-08-04 SVK::Resolve(3)
Mac OS X 10.6 - Generated Thu Sep 17 20:15:22 CDT 2009