New tools: diff, merge, 3-way merge

[kaby76]

There should be some commands in Trash to do diffs, merge, and 3-way merges. E.g., diff "//foobar" "//foobar2". Note, it should be general enough to compare across documents, too.