Manual Reference Pages - SVK::RESOLVE (3)
SVK::Resolve - Interactively resolve conflicts
a : Accept the merged/edited file.
y : Keep only changes to your file.
t : Keep only changes to their file.
d : Diff your file against merged file.
dm : See merged changes.
dy : See your changes alone.
dt : See their changes alone.
e : Edit merged file with an editor.
m : Run an external merge tool to edit merged file.
s : Skip this file.
h : Print this help message.
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.20.3 ||SVK::RESOLVE (3) ||2008-08-05 |
Visit the GSP FreeBSD Man Page Interface.
Output converted with manServer 1.07.