Project Home

xxdiff-subversion

Author: Martin Blais <blais@furius.ca>
Version: 854

Abstract

Simple wrapper script for integration with Subversion in user's configuration file. This is meant to be used in a user's configuration file to set diff-cmd and diff3-cmd.

Table of Contents

Description

Simple wrapper script for integration with Subversion in user's configuration file. This is meant to be used in a user's configuration file to set diff-cmd and diff3-cmd.

Add the following lines ~/.subversion/config:

diff-cmd = xxdiff-subversion
diff3-cmd = xxdiff-subversion

Usage

xxdiff-subversion [<options>] <file> <file> [<file>]

Options

--version             show program's version number and exit
-h, --help            show this help message and exit
-u                    See diff(1). Ignored for xxdiff.
-L LABEL, --label=LABEL
                      See diff(1). Label gets set as file title string for
                      xxdiff.
-E, --show-overlap    See diff3(1). Ignored for xxdiff.
-m, --merge           See diff3(1). Passed to xxdiff for automatic selection
                      of non-conflictual regions..

Download

Download program here.

Requirements

Copyright

Copyright (C) 2003-2004 Martin Blais <blais@furius.ca>. This code is distributed under the terms of the GNU General Public License.