commit 46fb73bf4d3b3e654c71ba8dd195d53a05e2fe5c
Author: cypherpunks <cypherpu...@torproject.org>
Date: Sat May 20 17:16:16 2017 +0000
Ignore git mergetool backup files
Closes #22314.
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..66685a5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore git mergetool backup files
+*.orig
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
