commit 7e708a56bd257d7e9d841f0f8f517192e2f3d727 Author: cypherpunks <cypherpunks@torproject.org> Date: Fri Jul 1 14:27:09 2016 +0000 Add git mergetool backups to the git ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e0058e3..ffa8511 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.orig *.swp *pyc *pyd