diff options
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge_test.go b/merge_test.go index 3f9dc33..cc7af81 100644 --- a/merge_test.go +++ b/merge_test.go @@ -34,7 +34,7 @@ func TestMergeAnalysisWithSelf(t *testing.T) { mergeHeads := make([]*MergeHead, 1) mergeHeads[0] = mergeHead - a, err := repo.MergeAnalysis(mergeHeads) + a, _, err := repo.MergeAnalysis(mergeHeads) checkFatal(t, err) if a != MergeAnalysisUpToDate { |