merge branch_1 and branch_2

Natural-selection1 · Natural-selection1 · commit 2bf7ae84e564 · 2025-05-18T17:15:03.000+08:00
diff --git a/src/main.rs b/src/main.rs
@@ -503,5 +503,6 @@ fn some_real_example_2() {
 }
 
 fn test() {
+    let branch_1 = 1;
     let branch_2 = 2; // 我修改了过去, 为branch_2添加了注释
 }

Original file line number	Diff line number	Diff line change
`@@ -503,5 +503,6 @@ fn some_real_example_2() {`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`fn test() {`
	`506`	`+ let branch_1 = 1;`
`506`	`507`	`let branch_2 = 2; // 我修改了过去, 为branch_2添加了注释`
`507`	`508`	`}`