Fix 483 - rm already covered bats

integration-tests/bats/1pk5col-ints.bats

@@ -729,42 +729,29 @@ DELIM
 }
 
 @test "1pk5col-ints: display correct merge stats" {
-    dolt checkout -b test-branch
-    dolt add test
-    dolt commit -m "added test table"
-    dolt checkout main
-    dolt branch test-branch-m
-    dolt branch test-branch-alt
-    dolt checkout test-branch-m
-    dolt merge test-branch --no-commit
-    dolt checkout test-branch-alt
-    dolt sql -q "CREATE TABLE test_alt (pk BIGINT NOT NULL, c1 BIGINT, PRIMARY KEY (pk));"
-    dolt add test_alt
-    dolt commit -m 'add test_alt'
-    dolt checkout test-branch-m
-    dolt merge test-branch-alt --no-commit
-    dolt add test_alt
-    dolt commit -m 'merge test_alt'
-    dolt checkout test-branch
-    dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
-    dolt add test
-    dolt commit -m "added row to test"
-    dolt checkout test-branch-m
-    run dolt merge test-branch -m "merge"
-    [ "$status" -eq 0 ]
-    [ "${lines[6]}" = "test | 1 +" ]
-    [ "${lines[7]}" = "1 tables changed, 1 rows added(+), 0 rows modified(*), 0 rows deleted(-)" ]
-}
-
-@test "1pk5col-ints: checkout table with branch of same name" {
-    dolt checkout -b test
-    dolt add .
-    dolt commit -m "added test table"
-    dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
-    run dolt checkout test
-    skip "Should distinguish between branch name and table name" [ "$status" -eq 0 ]
-    [ "${lines[0]}" != "Already on branch 'test'" ]
-    run dolt status
-    [ "$status" -eq 0 ]
-    [ "${lines[4]}" != "	modified:       test" ]
+  dolt checkout -b test-branch
+  dolt add test
+  dolt commit -m "added test table"
+  dolt checkout main
+  dolt branch test-branch-m
+  dolt branch test-branch-alt
+  dolt checkout test-branch-m
+  dolt merge test-branch --no-commit
+  dolt checkout test-branch-alt
+  dolt sql -q "CREATE TABLE test_alt (pk BIGINT NOT NULL, c1 BIGINT, PRIMARY KEY (pk));"
+  dolt add test_alt
+  dolt commit -m 'add test_alt'
+  dolt checkout test-branch-m
+  dolt merge test-branch-alt --no-commit
+  dolt add test_alt
+  dolt commit -m 'merge test_alt'
+  dolt checkout test-branch
+  dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
+  dolt add test
+  dolt commit -m "added row to test"
+  dolt checkout test-branch-m
+  run dolt merge test-branch -m "merge"
+  [ "$status" -eq 0 ]
+  [ "${lines[6]}" = "test | 1 +" ]
+  [ "${lines[7]}" = "1 tables changed, 1 rows added(+), 0 rows modified(*), 0 rows deleted(-)" ]
 }