diff options
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -43,6 +43,7 @@ git-mailinfo git-mailsplit git-merge git-merge-base +git-merge-fredrik git-merge-index git-merge-octopus git-merge-one-file |