Merge pull request #24818 from JuliaLang/rf/unmerge-merge!

unmerge Base.merge! and LibGit2.merge!
JuliaLang · Nov 29, 2017 · c322fed · c322fed
2 parents 2316bb5 + 181a2ae
commit c322fed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -2137,6 +2137,8 @@ end
 @deprecate linspace(start, stop)     linspace(start, stop, 50)
 @deprecate logspace(start, stop)     logspace(start, stop, 50)
 
+@deprecate merge!(repo::LibGit2.GitRepo, args...; kwargs...) LibGit2.merge!(repo, args...; kwargs...)
+
 # END 0.7 deprecations
 
 # BEGIN 1.0 deprecations

diff --git a/base/libgit2/libgit2.jl b/base/libgit2/libgit2.jl
@@ -5,7 +5,7 @@ Interface to [libgit2](https://libgit2.github.com/).
 """
 module LibGit2
 
-import Base: merge!, ==
+import Base: ==
 
 export with, GitRepo, GitConfig