diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-04-04 06:55:02 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-04-04 06:55:02 +0200 |
| commit | 3b70ad2c26a832e44f459f0f659c002603e75378 (patch) | |
| tree | d2114a844af6a520c47a8fbbfcd8d123193987ba /tests/doctests/test_GitRepository.py | |
| parent | 515db2e7837ea7f435e249323c9d1a280cfb7667 (diff) | |
GitRepository: add is_in_merge()
Diffstat (limited to 'tests/doctests/test_GitRepository.py')
| -rw-r--r-- | tests/doctests/test_GitRepository.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/doctests/test_GitRepository.py b/tests/doctests/test_GitRepository.py index 283f7658..04796848 100644 --- a/tests/doctests/test_GitRepository.py +++ b/tests/doctests/test_GitRepository.py @@ -687,6 +687,8 @@ def test_merge(): >>> repo = gbp.git.GitRepository(dirs['repo']) >>> repo.set_branch('master') >>> repo.merge('foo') + >>> repo.is_in_merge() + False """ |