reconcile-text 0.4.8

Think diff3 or git merge, but with automated conflict resolution that requires no user intervention
Documentation