Modified for use with vimdiff