rediff (1)
Leading comments
Title: rediff
Author:
Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
Date: 13 May 2002
Manual: Man pages
Source: patchutils
Language: English
NAME
rediff, editdiff - fix offsets and counts of a hand-edited diffSYNOPSIS
-
rediff ORIGINAL EDITED
- rediff EDITED
- rediff {[--help] | [--version]}
- editdiff FILE
- editdiff {[--help] | [--version]}
- rediff EDITED
DESCRIPTION
A small script, editdiff, is provided for editing a diff file in-place.
The types of changes that are currently handled are:
- * Modifying the text of any file content line (of course).
- * Adding new line insertions or deletions.
- * Adding, changing or removing context lines. Lines at the context horizon are dealt with by adjusting the offset and/or count.
- * Adding a single hunk (@@-prefixed section).
- * Removing multiple hunk (@@-prefixed sections).
Alternatively, if only one argument is provided, it is taken to be the edited file and the counts and offsets are adjusted as appropriate. Some assumptions are made when used in this mode. See recountdiff(1) for more information.
OPTIONS
--help
- Display a short usage message.
--version
- Display the version number of rediff.
SEE ALSO
AUTHOR
Tim Waugh <twaugh@redhat.com>
- Package maintainer