Namespace Diff and Patch to avoid conflict with diff-lcs