Skip site navigation (1)Skip section navigation (2)

FreeBSD Manual Pages

  
 
  

home | help
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.32.0			  2008-08-05		       SVK::Resolve(3)

NAME | DESCRIPTION

Want to link to this manual page? Use this URL:
<https://www.freebsd.org/cgi/man.cgi?query=SVK::Resolve&sektion=3&manpath=FreeBSD+12.2-RELEASE+and+Ports>

home | help