diff options
| author | Carlos Martín Nieto <[email protected]> | 2014-12-05 11:45:39 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2014-12-05 11:45:39 +0100 |
| commit | 1d0a688411be0d79d5ed8257c8a70d0d151e4ef7 (patch) | |
| tree | 32ff46e2c994351a081dcd6ef7ffc96478ecb42c /merge_test.go | |
| parent | 17963043741d7057cae1782032d022af0cd053fb (diff) | |
| parent | 1d759e3697c9236916ffb782b3721a96760bfc07 (diff) | |
Merge pull request #144 from libgit2/update
Update to master
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/merge_test.go b/merge_test.go index 7e884c0..1eba806 100644 --- a/merge_test.go +++ b/merge_test.go @@ -13,10 +13,10 @@ func TestMergeWithSelf(t *testing.T) { master, err := repo.LookupReference("refs/heads/master") checkFatal(t, err) - mergeHead, err := repo.MergeHeadFromRef(master) + mergeHead, err := repo.AnnotatedCommitFromRef(master) checkFatal(t, err) - mergeHeads := make([]*MergeHead, 1) + mergeHeads := make([]*AnnotatedCommit, 1) mergeHeads[0] = mergeHead err = repo.Merge(mergeHeads, nil, nil) checkFatal(t, err) @@ -30,10 +30,10 @@ func TestMergeAnalysisWithSelf(t *testing.T) { master, err := repo.LookupReference("refs/heads/master") checkFatal(t, err) - mergeHead, err := repo.MergeHeadFromRef(master) + mergeHead, err := repo.AnnotatedCommitFromRef(master) checkFatal(t, err) - mergeHeads := make([]*MergeHead, 1) + mergeHeads := make([]*AnnotatedCommit, 1) mergeHeads[0] = mergeHead a, _, err := repo.MergeAnalysis(mergeHeads) checkFatal(t, err) |