set stagedRoot = workingRoot in WorkingSet.AbortMerge()

go/libraries/doltcore/doltdb/workingset.go

@@ -136,6 +136,7 @@ func (ws WorkingSet) StartMerge(commit *Commit) *WorkingSet {
 
 func (ws WorkingSet) AbortMerge() *WorkingSet {
 	ws.workingRoot = ws.mergeState.PreMergeWorkingRoot()
+	ws.stagedRoot = ws.workingRoot
 	ws.mergeState = nil
 	return &ws
 }

integration-tests/bats/merge.bats

@@ -109,7 +109,6 @@ teardown() {
     run dolt status
     [ "$status" -eq 0 ]
     [[ "${lines[0]}" =~ "On branch master" ]] || false
-    skip "index is left dirty after --abort"
     [[ "${lines[1]}" =~ "nothing to commit, working tree clean" ]] || false
 }
 

integration-tests/bats/sql-merge.bats

@@ -376,7 +376,6 @@ SQL
     run dolt status
     [ "$status" -eq 0 ]
     [[ "${lines[0]}" =~ "On branch master" ]] || false
-    skip "index is left dirty after --abort"
     [[ "${lines[1]}" =~ "nothing to commit, working tree clean" ]] || false
 }