Carlos Martín Nieto 55037c23a3 Adjust to the merge changes ...

There is no more MergeResult type. Instead, the user can use
Repository.merge_analysis() to get an overview of their options and call
git_merge() when they mean to merge.

The git_merge() function now also performs a checkout.

2014-04-01 19:48:20 +02:00

..

data

implementing merge with default options

2013-12-04 18:23:13 +01:00

__init__.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_blame.py

Blame: orig_ is now filled

2014-04-01 19:47:48 +02:00

test_blob.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_branch.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_commit.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_config.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_credentials.py

credentials: use more ducks

2014-03-26 20:23:04 +01:00

test_diff.py

Adjust to oid -> id renaming

2014-04-01 19:47:48 +02:00

test_index.py

Adjust to oid -> id renaming

2014-04-01 19:47:48 +02:00

test_note.py

Adjust to oid -> id renaming

2014-04-01 19:47:48 +02:00

test_object.py

object: allow passing a type object to peel()

2014-02-11 18:30:47 +01:00

test_oid.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_options.py

Create proxy object for libgit2 options

2014-03-23 15:53:32 +01:00

test_reflog.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_refs.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_remote.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_repository.py

Adjust to the merge changes

2014-04-01 19:48:20 +02:00

test_revwalk.py

walk: make the sorting mode optional

2014-02-06 10:46:30 +01:00

test_signature.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_status.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_tag.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_tree.py

Update copyright year

2014-02-04 08:02:12 +01:00

test_treebuilder.py

Update copyright year

2014-02-04 08:02:12 +01:00

utils.py

Update copyright year

2014-02-04 08:02:12 +01:00