From 17a172920fde8c6688c8a1a39f258629b8b73757 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 14 Jul 2010 20:14:29 +0200 Subject: Fixed the missing Repo type documentation thanks to a hint of gasche, fixed a few more resT syntax errors on the way --- lib/git/index/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/git/index/base.py') diff --git a/lib/git/index/base.py b/lib/git/index/base.py index 5011a932..386926c5 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -445,12 +445,12 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): def unmerged_blobs(self): """ - Returns + :return: Iterator yielding dict(path : list( tuple( stage, Blob, ...))), being a dictionary associating a path in the index with a list containing sorted stage/blob pairs - Note: + :note: Blobs that have been removed in one side simply do not exist in the given stage. I.e. a file removed on the 'other' branch whose entries are at stage 3 will not have a stage 3 entry. -- cgit v1.2.3