This is an automated cherry-pick of pingcap#21513

Signed-off-by: ti-chi-bot <[email protected]>

Author: Frank945946

system-variables.md

@@ -3571,9 +3571,13 @@ SHOW WARNINGS;
 >
 > This TiDB variable is not applicable to TiDB Cloud.
 
+<<<<<<< HEAD
 </CustomContent>
 
 - Scope: SESSION | GLOBAL
+=======
+- Scope: GLOBAL
+>>>>>>> ad5a4464e1 (Update the scope of system-variable ”tidb_redact_log“ (#21513))
 - Persists to cluster: Yes
 - Type: Boolean
 - Default value: `OFF`