Add diff functionality.

[joelpt]

In lieu of using an external merge tool, perform a diff between the historical and current versions of a file and show the results in a Diff-syntax-colored buffer.

[joelpt]

Example here: https://github.com/vishr/local-history/blob/master/history.py