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

ABSTRACT:
When comparing files using the TPF Merge Tool, sometimes one common
line is included in the difference block.

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

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

COMMENTS:
The TPF Merge Tool needs to treat some identical lines as difference
when the matching blocks are out of order. This may cause one identical
line included in the difference block in the Merge Result display.

SOLUTION:
The matchDuplicate logic in Diff2.java has been updated such that the
conditions to treat common lines as differences are further restricted.
When the matching blocks are out of order during file merge, the TPF
Merge Tool will not include an additional common line in the difference
block in the Merge Result display.


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 PJ28347