diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 4ff2fec27..8054d9ddb 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,6 @@ git-merge-one-file git-merge-ours git-merge-recursive git-merge-resolve -git-merge-stupid git-merge-subtree git-mergetool git-mktag |