kv: deflake TestStoreRangeMergeWithData

Fixes cockroachdb#126249.

This commit deflakes the test by making sure that the merge transaction
does not get aborted after each time we manually advance the clock to
trigger a lease acquisition.

Release note: None

pkg/kv/kvserver/client_merge_test.go

@@ -274,6 +274,10 @@ func TestStoreRangeMergeWithData(t *testing.T) {
 func mergeWithData(t *testing.T, retries int64) {
 	ctx := context.Background()
 
+	// Set a long txn liveness threshold so that the merge txn cannot be aborted,
+	// even when we manually advance the clock to trigger a lease acquisition.
+	defer txnwait.TestingOverrideTxnLivenessThreshold(time.Hour)()
+
 	manualClock := hlc.NewHybridManualClock()
 	var store *kvserver.Store
 	// Maybe inject some retryable errors when the merge transaction commits.