Carlos Martín Nieto 78d80147ab Move merge tests to their own file ...

The method is in Repository, but the merge functionality is separate. We
will introduce more tests in this area later.

2014-07-10 09:08:16 +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

Blob: implement the memory buffer interface

2014-04-23 12:35:17 +02: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

Config: expose config rules parsing

2014-04-21 14:11:41 +02: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

Merge remote-tracking branch 'upstream/master' into development

2014-06-07 21:38:07 +02:00

test_merge.py

Move merge tests to their own file

2014-07-10 09:08:16 +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

Remote: make renaming take a method call

2014-06-08 20:35:21 +02:00

test_repository.py

Move merge tests to their own file

2014-07-10 09:08:16 +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