diff3.py File Reference

Go to the source code of this file.

Namespaces
	basis.diff3

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

Variables
def	basis.diff3.diff = _diff_heckel