basis.diff3 Namespace Reference

Functions
def	diff3 (yourtext, origtext, theirtext)
def	merge (yourtext, origtext, theirtext)

Variables
def	diff = _diff_heckel

Function Documentation

diff3()

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 34 of file diff3.py.

merge()

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

Definition at line 117 of file diff3.py.

Variable Documentation

diff

def basis.diff3.diff = _diff_heckel

Definition at line 239 of file diff3.py.