aediff(1)

NAME
aediff - file differences between deltas

SYNOPSIS
aediff [ option... ] filename
aediff -Help
aediff -VERSion

DESCRIPTION
The aediff command is used to obtain the difference between versions of the given filename across different file versions, a specified by the command lien options.

If two changes or deltas are specified, the difference between the versions of the file in each will be output.

If only one change or delta is specified, the second version defaults to the current change.

If no changes or deltas are specified, the first version defaults to the baseline and the second version defaults to the current change.

  Examples
To see the difference in the project configuration file, aegis.conf, between deltas 1.2.D003 and 4.5.D067 the following command may be used:
    aediff aegis.conf -c 1.2.D003 -c 4.5.D067
To see the differences in the project configuration file, between the head of the 7.6 branch and the current change, the following command may be used:
    aediff -branch 7.6 -bl aegis.conf
Many, many other combinatiosn are possible.

  Using Graphical Tools
It is possible to use a graphical diff tool with the aediff(1) command. This is done by using the -command option, or setting the AE2DIFF environment variable. For example, to use the tkdiff(1) command to display the differences you would use a command such as:
    aediff --command=tkdiff filename
If you use this option, many of the diff(1)-specific options will be ignored.

OPTIONS
The following options are understood:

-COMmand string
    This option may be used to set the command used to display differences. Using this option will cause diff(1)-specific options to be ignored. If not set, defaults to the value of the AE2DIFF environment variable, or "diff" otherwise.

-CONtext [ lines ]
    Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch(1) typically needs at least two lines of context.

-Ignore_Blank_Lines
    Ignore changes that just insert or delete blank lines.

-Ignore_All_Space
    Ignore white space when comparing lines.

-Ignore_Case
    Ignore changes in case; consider upper- and lower-case to be the same.

-Ignore_Space_Change
    Ignore changes in amount of white space.

-Show_C_Function
    Show which C function each change is in.

-unified [ lines ]
    Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. For proper operation, patch(1) typically needs at least two lines of context.