Initial commit - full huishou project

2026-07-27 14:07:26 +08:00
commit 60790ad1b3
39127 changed files with 5989265 additions and 0 deletions
@@ -0,0 +1 @@
+master
@@ -0,0 +1 @@
+ref: refs/heads/master
@@ -0,0 +1 @@
+e2809157a7766f272e4cfe26e61ef2678a5357ff
@@ -0,0 +1,5 @@
+Merge branch 'branch'
+
+Conflicts:
+	conflicts-one.txt
+	conflicts-two.txt
@@ -0,0 +1 @@
+3a34580a35add43a4cf361e8e9a30060a905c876
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371828 -0500	commit (initial): initial
+9a05ccb4e0f948de03128e095f39dae6976751c5 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371835 -0500	checkout: moving from master to branch
+9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson <ethomson@edwardthomson.com> 1351371872 -0500	commit: branch
+e2809157a7766f272e4cfe26e61ef2678a5357ff 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371873 -0500	checkout: moving from branch to master
+9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson <ethomson@edwardthomson.com> 1351372106 -0500	commit: master
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371835 -0500	branch: Created from HEAD
+9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson <ethomson@edwardthomson.com> 1351371872 -0500	commit: branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371828 -0500	commit (initial): initial
+9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson <ethomson@edwardthomson.com> 1351372106 -0500	commit: master
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç}¥óíDÜx/�Oã"F2¯ooà®ê<*·Zo”‘»Ñ™uI²h²hrÄlÊÊ"r	YùT8¢'©Ä#v¾mÎÉ0.ÁøÂ¨¥òŒÁ.:”È.�#+³ñ9ÖÖáR^±¸®níGžô“Îü~í�[=�ÔVjRìÑ"ŠIçÙÁjD�Û”ˆ7|N`
@@ -0,0 +1 @@
+x¥�Ñ
!Dý¦Šm@³ËÉÅøc6Àq�#‘#AŒí‹Æü›y/™	µ”Ü�œ:ô#$–l•tH:é—„*D³XÖh¬VœáŸ}«
®ëË·n[-�ºÃý¤KüŠ_;…ZÎ@“¦‰ÉJGÔˆbÐqÞãŸ3"ï¹goŒ«@I
@@ -0,0 +1,3 @@
+x¥�K
+1D]ηΉ€�ωt> βΖx��N‡q1‰―ο(ήΐ]Υ{P·eΉ
m½Ω�.ΆSΜ0[Dc’υd
+Ε…�bM‰Τ�Ί¬Cgd�Ό@Ν>glΘX].$!ΗΡ0*z�Ήu})/κE_η¶<Ϊ��²ΡO:ΛWόΪ�Ϋr�Ζ΅qΡ¤hυ@mt;;δΟ5uZyVoΣ\M�
@@ -0,0 +1 @@
+e2809157a7766f272e4cfe26e61ef2678a5357ff
@@ -0,0 +1 @@
+3a34580a35add43a4cf361e8e9a30060a905c876
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+This is most certainly a conflict!
+=======
+This is a conflict!!!
+>>>>>>> branch
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+This is without question another conflict!
+=======
+This is another conflict!!!
+>>>>>>> branch
@@ -0,0 +1,10 @@
+This is file one!
+This is file one.
+This is file one.
+This is file one.
+This is file one.
+This is file one.
+This is file one.
+This is file one.
+This is file one.
+This is file one!
@@ -0,0 +1,12 @@
+This is file two!
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two.
+This is file two!
				`@@ -0,0 +1 @@`
				`Unnamed repository; edit this file 'description' to name the repository.`
				`@@ -0,0 +1 @@`
				`x¥�Ñ !Dý¦Šm@³ËÉÅøc6Àq�#‘#AŒí‹Æü›y/™ µ”Ü�œ:ô#$–l•tH:é—„*D³XÖh¬VœáŸ}« ®ëË·n[-�ºÃý¤KüŠ_;…ZÎ@“¦‰ÉJGÔˆbÐqÞãŸ3"ï¹goŒ«@I`