From 7906bdbdceddff34827ba13640b6d03bc813139f Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Sat, 31 May 2014 16:47:35 +0200 Subject: Merge: merge analysis now returns the user's preference --- merge_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge_test.go') 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 { -- cgit v1.2.3