A visual diff and merge tool - View it on GitHub