[Tickets #10548] Re: Horde_Text_Diff_ThreeWay does not render

[bugs at horde.org]

DO NOT REPLY TO THIS MESSAGE. THIS EMAIL ADDRESS IS NOT MONITORED.

Ticket URL: http://bugs.horde.org/ticket/10548
------------------------------------------------------------------------------
  Ticket             | 10548
  Updated By         | Jan Schneider <jan at horde.org>
  Summary            | Horde_Text_Diff_ThreeWay does not render
  Queue              | Horde Framework Packages
-Version            | FRAMEWORK_3
+Version            | Git master
  Type               | Bug
-State              | Unconfirmed
+State              | Resolved
  Priority           | 1. Low
  Milestone          |
  Patch              |
-Owners             |
+Owners             | Jan Schneider
------------------------------------------------------------------------------


Jan Schneider <jan at horde.org> (2011-10-11 17:57) wrote:

There actually is no 3-way diff functionality. The purpose of  
Horde_Text_Diff_ThreeWay is to make a 3-way *merge*. This works now,  
see the new unit test for usage examples.