My new favourite: Sublime Merge