basis::diff3 Namespace Reference

Functions
def	diff3
def	merge
Variables
	diff = _diff_heckel

---

Detailed Description

    @file  diff3.py
    @brief Three-way file comparison algorithm.

    This is a line-by-line translation of the Text::Diff3 Perl module version
    0.10 written by MIZUTANI Tociyuki <tociyuki@gmail.com>.

    The Text::Diff3 Perl module in turn was based on the diff3 program:

    Three way file comparison program (diff3) for Project GNU.
    Copyright (C) 1988, 1989, 1992, 1993, 1994 Free Software Foundation, Inc.
    Written by Randy Smith

    The two-way file comparison procedure was based on the article:
    P. Heckel. ``A technique for isolating differences between files.''
    Communications of the ACM, Vol. 21, No. 4, page 264, April 1978.

    Copyright (c) 2012 University of Pennsylvania. All rights reserved.
    See https://www.cbica.upenn.edu/sbia/software/license.html or COPYING file.

---

Function Documentation

def basis::diff3::diff3	(		yourtext,
			origtext,
			theirtext
	)

Three-way diff based on the GNU diff3.c by R. Smith.

@param [in] yourtext   Array of lines of your text.
@param [in] origtext   Array of lines of original text.
@param [in] theirtext   Array of lines of their text.

@returns Array of tuples containing diff results. The tuples consist of
         (cmd, loA, hiA, loB, hiB), where cmd is either one of
         '0', '1', '2', or 'A'.

Definition at line 28 of file diff3.py.

def basis::diff3::merge	(		yourtext,
			origtext,
			theirtext
	)

Definition at line 111 of file diff3.py.

---

Variable Documentation

basis::diff3::diff = _diff_heckel

Definition at line 233 of file diff3.py.