summaryrefslogtreecommitdiff
path: root/git/index/base.py
diff options
context:
space:
mode:
authorYobmod <yobmod@gmail.com>2021-05-17 18:10:13 +0100
committerYobmod <yobmod@gmail.com>2021-05-17 18:10:13 +0100
commit969185b76df038603a90518f35789f28e4cfe5b9 (patch)
treedd23539578776f66314d21f57a504030b15fa869 /git/index/base.py
parentf08d3067310e0251e6d5a33dc5bc65f1b76a2d49 (diff)
downloadgitpython-969185b76df038603a90518f35789f28e4cfe5b9.tar.gz
index.base unmerged_blobs() doc string
Diffstat (limited to 'git/index/base.py')
-rw-r--r--git/index/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/index/base.py b/git/index/base.py
index 5c4947ca..04424060 100644
--- a/git/index/base.py
+++ b/git/index/base.py
@@ -477,10 +477,10 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable):
def unmerged_blobs(self) -> Dict[PathLike, List[Tuple[StageType, Blob]]]:
"""
:return:
- Iterator yielding dict(path : list( tuple( stage, Blob, ...))), being
+ Dict(path : list( tuple( stage, Blob, ...))), being
a dictionary associating a path in the index with a list containing
sorted stage/blob pairs
- ##### Does it return iterator? or just the Dict?
+
:note:
Blobs that have been removed in one side simply do not exist in the