APAR NUMBER:  PJ28166
PRODUCT:  TPF4
FUNCTIONAL AREA:  TPF MERGE TOOL
SHIPPED IN PUT:

ABSTRACT:
TPF Merge Tool indicates a conflict instead of a difference when the
difference occurs at the end of the input files.

APAR CONTENTS:
FEATURE   TYPE                STATUS    NAME
Base      Object              Changed   ibm/tpf/tpfmerge/Diffn.class

PREREQUISITE APARS:  To be applied in order listed.
Base      Object              Changed   ibm/tpf/tpfmerge/Diffn.class
  PJ27381(13)  PJ27722(14)

COMMENTS:
When executing TPF Merge Tool on a 3-way merge, if the difference occurs
at the end of the input files, TPF Merge Tool indicates the difference
as a conflict. The TPF Merge Tool ignores the last character, which may
be an end-of-file character, read from the input files. When the
difference occurs at the end, the TPF Merge Tool will treat it as a
conflict because the last characters (or lines) are all different with
the 3 files.

SOLUTION:
An end-of-line character is now added to the end of the buffer of each
input file such that the TPF Merge Tool treats the end of the file as
common and treats the last difference, if any, correctly.


DEPENDENCIES

SEGMENTS TO BE ASSEMBLED OR COMPILED:
None.

SEGMENTS TO BE LINK EDITED:
None.

COREQS:
None.

MIGRATION CONSIDERATIONS:
The self-extracting executable for this fix is available through the
TPF Merge Tool Web page. Download the fix and double-click the
executable, and then specify the path that has the TPF Merge Tool
installed. The executable will replace the necessary files in the
appropriate directories.

DOWNLOAD INSTRUCTIONS:
http://www.ibm.com/software/htp/tpf/pages/maint.htm

BUILD INSTRUCTIONS:
None.

TEST INSTRUCTIONS:
None.       

-- END APAR PJ28166