1 files changed, 3 insertions, 0 deletions

diff --git a/.svnignore b/.svnignore
index 8805c21..31da1e9 100644
--- a/.svnignore
+++ b/.svnignore
@@ -35,3 +35,6 @@ autom4te*.cache
 *.asc
 *.zip
 *.so
+*.merge-left.*
+*.merge-right.*
+*.working