1 files changed, 0 insertions, 60 deletions
diff --git a/entity/dag/entity_test.go b/entity/dag/entity_test.go
index c5c83567..012c87aa 100644
--- a/entity/dag/entity_test.go
+++ b/entity/dag/entity_test.go
@@ -55,63 +55,3 @@ func assertEqualEntities(t *testing.T, a, b *Entity) {
 
 	require.Equal(t, a, b)
 }
-
-// // Merge
-//
-// merge1 := makeCommit(t, repo)
-// merge1 = makeCommit(t, repo, merge1)
-// err = repo.UpdateRef("merge1", merge1)
-// require.NoError(t, err)
-//
-// err = repo.UpdateRef("merge2", merge1)
-// require.NoError(t, err)
-//
-// // identical merge
-// err = repo.MergeRef("merge1", "merge2")
-// require.NoError(t, err)
-//
-// refMerge1, err := repo.ResolveRef("merge1")
-// require.NoError(t, err)
-// require.Equal(t, merge1, refMerge1)
-// refMerge2, err := repo.ResolveRef("merge2")
-// require.NoError(t, err)
-// require.Equal(t, merge1, refMerge2)
-//
-// // fast-forward merge
-// merge2 := makeCommit(t, repo, merge1)
-// merge2 = makeCommit(t, repo, merge2)
-//
-// err = repo.UpdateRef("merge2", merge2)
-// require.NoError(t, err)
-//
-// err = repo.MergeRef("merge1", "merge2")
-// require.NoError(t, err)
-//
-// refMerge1, err = repo.ResolveRef("merge1")
-// require.NoError(t, err)
-// require.Equal(t, merge2, refMerge1)
-// refMerge2, err = repo.ResolveRef("merge2")
-// require.NoError(t, err)
-// require.Equal(t, merge2, refMerge2)
-//
-// // merge commit
-// merge1 = makeCommit(t, repo, merge1)
-// err = repo.UpdateRef("merge1", merge1)
-// require.NoError(t, err)
-//
-// merge2 = makeCommit(t, repo, merge2)
-// err = repo.UpdateRef("merge2", merge2)
-// require.NoError(t, err)
-//
-// err = repo.MergeRef("merge1", "merge2")
-// require.NoError(t, err)
-//
-// refMerge1, err = repo.ResolveRef("merge1")
-// require.NoError(t, err)
-// require.NotEqual(t, merge1, refMerge1)
-// commitRefMerge1, err := repo.ReadCommit(refMerge1)
-// require.NoError(t, err)
-// require.ElementsMatch(t, commitRefMerge1.Parents, []Hash{merge1, merge2})
-// refMerge2, err = repo.ResolveRef("merge2")
-// require.NoError(t, err)
-// require.Equal(t, merge2, refMerge2)