Merge branch 'master' into tn/google-docstring (4e31be7b) · Commits · OmegaCEN / vcsinfo · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

vcsinfo
- Activity
- Members
- Releases
- Container Registry

Snippets Groups Projects

OmegaCEN
vcsinfo
Commits
4e31be7b

Commit 4e31be7b authored 8 years ago by

Teake Nutma

Downloads
- Plain Diff

Merge branch 'master' into tn/google-docstring

# Conflicts:
#	vcsinfo/factory.py
#	vcsinfo/implementations/git.py
#	vcsinfo/vcsinfo.py

parents 1aa948dc 9b64b21b

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

tests/test_git.py 6 additions, 6 deletions

tests/test_git.py
vcsinfo/exceptions.py 2 additions, 2 deletions

vcsinfo/exceptions.py
vcsinfo/factory.py 3 additions, 3 deletions

vcsinfo/factory.py
vcsinfo/implementations/git.py 11 additions, 11 deletions

vcsinfo/implementations/git.py
vcsinfo/vcsinfo.py 2 additions, 2 deletions

vcsinfo/vcsinfo.py

with 24 additions and 24 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment