Unified diff parsing and merge tool for Python