UNIFY

Section: User Commands (1)
Updated: LOCAL
Index Return to Main Contents

NAME

unify - turns context diffs into unidiffs and visa versa

SYNOPSIS

unify [-cepPsuU] [filename]

DESCRIPTION

Unify will accept either a regular context diff (old- or new-style) or a unified context diff (aka unidiff) as input, and generate either a unidiff or a new-style context diff as output. The default is to output the opposite style of whatever was input, but this can be overridden by the -c or -u options. If the source file is not mentioned, it will be read from the standard input.

Various other options allow you to echo the non-diff (comment) lines, modify the diff by removing the comment lines, and/or tweak the diff into a format that is good for releasing patches.

OPTIONS

-c

forces context diff output.

-e

echoes non-diff (comment) lines. If a comment line is being stripped via the -p option, it is echoed with a preceding ``!!! ''. If all comments are being stripped (via the -s option), no special designation is given.

-p

turns on patch-output mode. This will do three things:

a) transform a header like:

*** orig/file Sat May 5 02:59:37 1990

--- ./file Sat May 5 03:00:08 1990

into a line of ``Index: file'' -- we choose the shorter name and strip a leading ``./'' sequence if present.

b) strip lines that begin with:

     ``Only in ''

       ``Common subdir''

       ``diff -''

c) turn on the `=' prefix in a unidiff for lines that are common to both files (instead of the leading space).

-P

is the same as -p (for compatibility with gnu diff options).

-s

strips non-diff lines (comments).

-u

forces unidiff output.

-U

is the same as -uP.

AUTHOR

Wayne Davison <davison@dri.com> (uunet!drivax!davison)

This document was created by man2html, using the manual pages.
Time: 06:55:53 GMT, December 12, 2024