Defect with Diff3 utility

[Rahul Nerlikar]

Hi,
(B
(B 
(B
(BCould anyone shed some light on this peculiarity of the diff3 utility?
(B
(B 
(B
(BHere$B!G(Js the example OLDFile is as below,
(B
(B 
(B
(B#ENGLISH Resource File
(B
(B 
(B
(B#DoNotTranslate
(B
(BL6_WINDOWS = OK|O
(B
(B# fail to enable path.
(B
(Bset_pathEnabled_failed = Failed to enable the path.
(B
(B# fail to set preferred path.
(B
(Bset_preferredPath_failed = Failed to set preferred path.
(B
(Bset_primaryPath_failed = Failed to set primary path.
(B
(B# fail to purge disk
(B
(Bset_purgeDisk_failed = Failed to purge disks.
(B
(B# set Array status failed.
(B
(Bset_arrayStatus_failed = Failed to set array status.
(B
(B 
(B
(B# please wait message
(B
(Bmsg_wait_for_system_update = The system is currently too busy to update the 
(Bdevice status.  Please try the operation later.
(B
(B 
(B
(B# hard_disk_name
(B
(Bhard_disk_name=Harddisk
(B
(B 
(B
(B#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
(Bend.
(B
(Btop_path_menu = Path|P
(B
(B 
(B
(B 
(B
(BNew file is as below,
(B
(B 
(B
(B#ENGLISH Resource File
(B
(B 
(B
(B#DoNotTranslate
(B
(BL6_WINDOWS = OK|O
(B
(B#EndDoNotTranslate
(B
(B 
(B
(B# labels for the DMP client extension
(B
(BNONE_ID = None
(B
(BACTIVE_ACTIVE_ID = Active/Active|A
(B
(BACTIVE_PASSIVE_ID = Active/Passive|P
(B
(BNAME_ID = Array Name:
(B
(BOK_ID = OK|O
(B
(B# fail to enable path.
(B
(Bset_pathEnabled_failed = Failed to enable the path.
(B
(B# fail to set preferred path.
(B
(Bset_preferredPath_failed = Failed to set preferred path.
(B
(Bset_primaryPath_failed = Failed to set primary path.
(B
(B# fail to purge disk
(B
(Bset_purgeDisk_failed = Failed to purge disks.
(B
(B# set Array status failed.
(B
(Bset_arrayStatus_failed = Failed to set array status.
(B
(B 
(B
(B# please wait message
(B
(Bmsg_wait_for_system_update = The system is currently too busy to update the 
(Bdevice status.  Please try the operation later.
(B
(B 
(B
(B# hard_disk_name
(B
(Bhard_disk_name=Harddisk
(B
(B 
(B
(B#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
(Bend.
(B
(Btop_path_menu = Path|P
(B
(B 
(B
(BARRAY_GROUP_NODES = Arrays
(B
(B>>>>>>>>Note there is only a single CR at the end of this file and this 
(B>>>>>>>>statement is not part of the file.
(B
(B 
(B
(BYOURFILE is 
(B
(B 
(B
(B#JAPANESE Resource File
(B
(B 
(B
(B#DoNotTranslate
(B
(BL6_WINDOWS = OK|O
(B
(B#EndDoNotTranslate
(B
(B 
(B
(B# labels for the DMP client extension
(B
(BNONE_ID = $B$J$7(J
(B
(BACTIVE_ACTIVE_ID = $B%"%/%F%#%V!_%"%/%F%#%V(J|A
(B
(BACTIVE_PASSIVE_ID = $B%"%/%F%#%V!_%Q%C%7%V(J|P
(B
(BNAME_ID = $B%"%l%$L>(J: 
(B
(BOK_ID = $BN;2r(J|O
(B
(B# fail to enable path.
(B
(Bset_pathEnabled_failed = $B%Q%9$NM-8z2=$K<:GT$7$^$7$?!#(J
(B
(B# fail to set preferred path.
(B
(Bset_preferredPath_failed = [EMAIL PROTECTED]@_Dj$K<:GT$7$^$7$?!#(J
(B
(Bset_primaryPath_failed = $B%W%i%$%^%j(J [EMAIL PROTECTED];$s$G$7$?!#(J
(B
(B# fail to purge disk
(B
(Bset_purgeDisk_failed = $B%G%#%9%/$N>C5n$K<:GT$7$^$7$?!#(J
(B
(B# set Array status failed.
(B
(Bset_arrayStatus_failed = $B%"[EMAIL PROTECTED]<:GT$7$^$7$?!#(J
(B
(B 
(B
(B# please wait message
(B
(Bmsg_wait_for_system_update = 
$B%7%9%F%`$,%S%8!<$J$?$a!"%G%P%$%9>uBV$r99?7$G$-$^$;$s$G$7$?!#$"$H$G$b$&0lEYhttp://lists.gnu.org/mailman/listinfo/bug-cvs