summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b73167c92..9a4bc80de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,10 @@ configure
SysConfig.hs
git-annex
git-annex-shell
+git-union-merge
git-annex.1
git-annex-shell.1
+git-union-merge.1
doc/.ikiwiki
html
*.tix