While working on legacy/trac#9087 i noticed the Chutney git ignore list does not ignore vim swap files and git mergetool backup files. The attached patches add both file extensions to the git ignore list.