Deletes .viminfo
ignoring .viminfo
resolved conflicts