summaryrefslogtreecommitdiff
path: root/test/git/test_tree.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2009-10-21 16:52:25 +0200
committerSebastian Thiel <byronimo@gmail.com>2009-10-21 18:17:47 +0200
commitbabf5765da3e328cc1060cb9b37fbdeb6fd58350 (patch)
tree2a04fc35a1dc68c64fb40188b1ec153370deb5fd /test/git/test_tree.py
parentb9d6494f1075e5370a20e406c3edb102fca12854 (diff)
downloadgitpython-babf5765da3e328cc1060cb9b37fbdeb6fd58350.tar.gz
Initial version of merge including tests for one-way, two-way and tree-way merge
Diffstat (limited to 'test/git/test_tree.py')
0 files changed, 0 insertions, 0 deletions