diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-25 23:58:24 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-25 23:58:24 +0200 |
| commit | 47e3138ee978ce708a41f38a0d874376d7ae5c78 (patch) | |
| tree | 0880f5c8f2a375e718c69fcffd15e87b7f4aecae /lib/git/index/fun.py | |
| parent | 58fb1187b7b8f1e62d3930bdba9be5aba47a52c6 (diff) | |
| download | gitpython-47e3138ee978ce708a41f38a0d874376d7ae5c78.tar.gz | |
Adjusted all files to (hopefully) deal with the fact that all objects now use 20 byte sha's internally as it is closer to the GitDB implementation
Switched all remaining files back to tabs
Adjusted all remaining docstrings to suit the sphinx doc convention - its likely that there are many of docstring syntax errors though
Diffstat (limited to 'lib/git/index/fun.py')
| -rw-r--r-- | lib/git/index/fun.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/index/fun.py b/lib/git/index/fun.py index 14a47fdc..ef950761 100644 --- a/lib/git/index/fun.py +++ b/lib/git/index/fun.py @@ -207,7 +207,7 @@ def aggressive_tree_merge(odb, tree_shas): trees. All valid entries are on stage 0, whereas the conflicting ones are left on stage 1, 2 or 3, whereas stage 1 corresponds to the common ancestor tree, 2 to our tree and 3 to 'their' tree. - :param tree_shas: 1, 2 or 3 trees as identified by their shas + :param tree_shas: 1, 2 or 3 trees as identified by their binary 20 byte shas If 1 or two, the entries will effectively correspond to the last given tree If 3 are given, a 3 way merge is performed""" out = list() |