SVK::Resolve man page on Fedora

SVK::Resolve man page on Fedora

Man page or keyword search:
man Server 31170 pages
apropos Keyword Search (all sections)
Output format

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

[top]

List of man pages available for Fedora

Copyright (c) for man pages and the logo by the respective OS vendor.

For those who want to learn more, the polarhome community provides shell access and support.

[legal] [privacy] [GNU] [policy] [cookies] [netiquette] [sponsors] [FAQ]

Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
....................................................................

Vote for polarhome