1SVK::Resolve(3)       User Contributed Perl Documentation      SVK::Resolve(3)
2
3
4

NAME

6       SVK::Resolve - Interactively resolve conflicts
7

DESCRIPTION

9         Accept:
10            a   : Accept the merged/edited file.
11            y   : Keep only changes to your file.
12            t   : Keep only changes to their file.
13         Diff:
14            d   : Diff your file against merged file.
15            dm  : See merged changes.
16            dy  : See your changes alone.
17            dt  : See their changes alone.
18         Edit:
19            e   : Edit merged file with an editor.
20            m   : Run an external merge tool to edit merged file.
21         Misc:
22            s   : Skip this file.
23            h   : Print this help message.
24
25         Environment variables:
26           EDITOR     : Editor to use for 'e'.
27           SVKMERGE   : External merge tool to always use for 'm'.
28           SVKRESOLVE : The resolve action to take, instead of asking.
29
30
31
32perl v5.30.0                      2019-07-26                   SVK::Resolve(3)