summaryrefslogtreecommitdiff
path: root/merge/.cvsignore
diff options
context:
space:
mode:
Diffstat (limited to 'merge/.cvsignore')
-rw-r--r--merge/.cvsignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/merge/.cvsignore b/merge/.cvsignore
new file mode 100644
index 00000000000..e9955884756
--- /dev/null
+++ b/merge/.cvsignore
@@ -0,0 +1,3 @@
+.deps
+Makefile
+Makefile.in