[CR] Flatten if/elses in catalog/mvcc/cataloger_merge_test.go

Co-authored-by: Barak Amar <barak.amar@treeverse.io>
treeverse · Nov 25, 2020 · b35b36e · b35b36e
1 parent 74527c9
commit b35b36e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/catalog/mvcc/cataloger_merge_test.go b/catalog/mvcc/cataloger_merge_test.go
@@ -140,10 +140,9 @@ func TestCataloger_Merge_FromParentConflicts(t *testing.T) {
 	}
 	if res == nil {
 		t.Errorf("Merge returned nil, err %s", err)
-	} else {
-		if res.Reference != "" {
-			t.Errorf("Merge reference = %s, expected to be empty", res.Reference)
-		}
+	} else if res.Reference != "" {
+		t.Errorf("Merge reference = %s, expected to be empty", res.Reference)
+	}
 	}
 }