JuxtaCode

JuxtaCode

Git diffs & merges, but nicer