diff options
| author | Carlos Martín Nieto <[email protected]> | 2014-05-31 16:47:35 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2014-05-31 16:47:35 +0200 |
| commit | 7906bdbdceddff34827ba13640b6d03bc813139f (patch) | |
| tree | efab136c622306aff0f2a771beb8f28671d9fa76 /merge_test.go | |
| parent | 8a73c75f1a68f2855d03e6d2ce45c95c414aa71a (diff) | |
Merge: merge analysis now returns the user's preference
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 { |