[tor-commits] [atlas/master] Ignore git mergetool backup files