aboutsummaryrefslogtreecommitdiff
path: root/.svnignore
diff options
context:
space:
mode:
Diffstat (limited to '.svnignore')
-rw-r--r--.svnignore3
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