git-test

Author	SHA1	Message	Date
WYS	a23051ddb0	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt	6 months ago
WYS	7803204d87	br1	6 months ago
WYS	4a8b1b4a84	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt	6 months ago
WYS	425671248a	br1	6 months ago
WYS	f98a0edb4d	Merge branch 'br1' # Conflicts: # a.txt	6 months ago
WYS	2b796044d7	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2	6 months ago
WYS	1c75497c31	Squashed commit of the following: commit `ef5af86171` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:29:51 2024 +0800 br1	6 months ago

1 changed files with 1 additions and 1 deletions

 @ -1,2 +1,2 @@
 aaaa
 br1
 br2

Compare commits