ignore vim tmp files
merge