Implement merge by diff and vimdiff (close gh-10).
Add documentation.