aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/doctests/test_GitRepository.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/doctests/test_GitRepository.py')
-rw-r--r--tests/doctests/test_GitRepository.py2
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
"""