vimdiff is awful; let's try opendiff