From 7c6ae2b94cfd1593c12366b6abc0cd5bbb6e07b2 Mon Sep 17 00:00:00 2001
From: Yobmod <yobmod@gmail.com>
Date: Fri, 9 Jul 2021 15:07:50 +0100
Subject: Try to distinguation git.diff module from diff.Diff.diff and
 diff.Daffable.diff()

---
 git/objects/tree.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'git/objects/tree.py')

diff --git a/git/objects/tree.py b/git/objects/tree.py
index 9d221652..4c2a02bf 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 from git.util import IterableList, join_path
-import git.diff as diff
+import git.diff as git_diff
 from git.util import to_bin_sha
 
 from . import util
@@ -180,7 +180,7 @@ class TreeModifier(object):
     #} END mutators
 
 
-class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
+class Tree(IndexObject, git_diff.Diffable, util.Traversable, util.Serializable):
 
     """Tree objects represent an ordered list of Blobs and other Trees.
 
-- 
cgit v1.2.1