Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean up of merge! documentation #22503

Merged
merged 1 commit into from
Jun 25, 2017
Merged

Conversation

fredrikekre
Copy link
Member

Fixes the following three problems:

  • LibGit2.merge! documentation showed up in stdlib/collections.md
  • random LibGit2.merge! docstrings showed up in ?merge! in the REPL which looked like part of other docstrings since there was no function signature.
  • LibGit2.merge! missing from devdocs/libgit2.md

Rendered documentation looks good locally.

Fixes the following three problems:
- LibGit2.merge! documentation showed up in stdlib/collections.md
- random LibGit2.merge! docstrings showed up in ?merge! in the REPL
- LibGit2.merge! missing from devdocs/libgit2.md
@kshyatt kshyatt added docs This change adds or pertains to documentation libgit2 The libgit2 library or the LibGit2 stdlib module labels Jun 24, 2017
@KristofferC KristofferC reopened this Jun 24, 2017
@fredrikekre
Copy link
Member Author

timeout on 32bit linux

@KristofferC KristofferC merged commit 8c3bdfe into JuliaLang:master Jun 25, 2017
@fredrikekre fredrikekre deleted the fe/merge branch June 25, 2017 04:07
DrTodd13 pushed a commit to IntelLabs/julia that referenced this pull request Jun 26, 2017
Fixes the following three problems:
- LibGit2.merge! documentation showed up in stdlib/collections.md
- random LibGit2.merge! docstrings showed up in ?merge! in the REPL
- LibGit2.merge! missing from devdocs/libgit2.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs This change adds or pertains to documentation libgit2 The libgit2 library or the LibGit2 stdlib module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants