summary refs log tree commit diff homepage
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d08a301..c072f2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 chroot.tar
 client
 help
+merge
 meta
 root
 server