From a00e2005250695c2ff0508410660cb2382f8cc1f Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 16:22:34 +0800 Subject: [PATCH 01/10] Test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 测试修改可否成功 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b753b2b..e495b9a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # hello-world Just another respository I love drink coffee,what about you +这里是对修改的测试 \ No newline at end of file From 69218509b097b2d97c011ad19c47067b1b3fa5c6 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 16:31:17 +0800 Subject: [PATCH 02/10] Num2Change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 第二次修改 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e495b9a..56619c4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # hello-world Just another respository I love drink coffee,what about you -这里是对修改的测试 \ No newline at end of file +这里是对修改的测试 +这里是第二次修改 \ No newline at end of file From 1c99769e773c88ae66b6062e370ad3a701bb5023 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 16:58:39 +0800 Subject: [PATCH 03/10] test3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 第三次修改 --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 56619c4..779438f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # hello-world Just another respository I love drink coffee,what about you +<<<<<<< HEAD 这里是对修改的测试 -这里是第二次修改 \ No newline at end of file +这里是第二次修改 +======= +>>>>>>> parent of a00e200... Test +这里是第三次修改 From ae3a99a4258d5ef6d45bbe837a45f9439c405716 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 16:59:26 +0800 Subject: [PATCH 04/10] Revert "test3" This reverts commit 1c99769e773c88ae66b6062e370ad3a701bb5023. --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 779438f..56619c4 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # hello-world Just another respository I love drink coffee,what about you -<<<<<<< HEAD 这里是对修改的测试 -这里是第二次修改 -======= ->>>>>>> parent of a00e200... Test -这里是第三次修改 +这里是第二次修改 \ No newline at end of file From ef0f535185edfe00751b0779d48b17623006fe34 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 17:11:17 +0800 Subject: [PATCH 05/10] NewDoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增添新文档 --- ...\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" diff --git "a/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" new file mode 100644 index 0000000..e01fb19 --- /dev/null +++ "b/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" @@ -0,0 +1 @@ +Ǹ \ No newline at end of file From dafa87a07014a0b217f83505a3d64bfad8c6139b Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 17:12:07 +0800 Subject: [PATCH 06/10] DelDoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除文档 --- ...\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" | 1 - 1 file changed, 1 deletion(-) delete mode 100644 "\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" diff --git "a/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" deleted file mode 100644 index e01fb19..0000000 --- "a/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" +++ /dev/null @@ -1 +0,0 @@ -Ǹ \ No newline at end of file From 1ff535b396b5dbd260daed073d498053782d4239 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 17:29:17 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...3\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 "\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" diff --git "a/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" "b/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" new file mode 100644 index 0000000..5278949 --- /dev/null +++ "b/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" @@ -0,0 +1,4 @@ +hahhahahahhahahah +jandjwndkjnwed +wdwlmdwlmdw +啊啊啊啊啊 \ No newline at end of file From 24d38d2cc5c2d3e1cf34f6d60bc4db8a12078278 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 20:09:35 +0800 Subject: [PATCH 08/10] test4 --- README.md | 3 ++- debug.log | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debug.log diff --git a/README.md b/README.md index 56619c4..a38dea5 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ Just another respository I love drink coffee,what about you 这里是对修改的测试 -这里是第二次修改 \ No newline at end of file +这里是第二次修改 +这里是第四次修改 \ No newline at end of file diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..2ad526f --- /dev/null +++ b/debug.log @@ -0,0 +1,14 @@ +[0421/182203:WARNING:resource_bundle.cc(304)] locale_file_path.empty() +[0421/182203:ERROR:main_delegate.cc(564)] Could not load locale pak for en-US +[0421/182203:ERROR:main_delegate.cc(571)] Could not load cef.pak +[0421/182203:ERROR:main_delegate.cc(588)] Could not load cef_100_percent.pak +[0421/182204:WARNING:resource_bundle.cc(497)] locale resources are not loaded +[0421/182204:WARNING:resource_bundle.cc(304)] locale_file_path.empty() +[0421/182204:ERROR:main_delegate.cc(564)] Could not load locale pak for en-US +[0421/182204:ERROR:main_delegate.cc(571)] Could not load cef.pak +[0421/182204:ERROR:main_delegate.cc(588)] Could not load cef_100_percent.pak +[0421/182210:WARNING:resource_bundle.cc(304)] locale_file_path.empty() +[0421/182210:ERROR:main_delegate.cc(564)] Could not load locale pak for en-US +[0421/182210:ERROR:main_delegate.cc(571)] Could not load cef.pak +[0421/182210:ERROR:main_delegate.cc(588)] Could not load cef_100_percent.pak +[0421/182210:ERROR:renderer_main.cc(207)] Running without renderer sandbox From ade161985442c313778f5a4d3010c52c84793420 Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 20:10:07 +0800 Subject: [PATCH 09/10] test5 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a38dea5..3e8c6c9 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ Just another respository I love drink coffee,what about you 这里是对修改的测试 这里是第二次修改 -这里是第四次修改 \ No newline at end of file +这里是第四次修改 +这里是第五次修改 \ No newline at end of file From 17618f6d9facfc4d34cd58964fa97f2395fa348a Mon Sep 17 00:00:00 2001 From: hao38548 <937592093@qq.com> Date: Thu, 21 Apr 2016 20:10:33 +0800 Subject: [PATCH 10/10] test6 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e8c6c9..9bf9443 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,5 @@ I love drink coffee,what about you 这里是对修改的测试 这里是第二次修改 这里是第四次修改 -这里是第五次修改 \ No newline at end of file +这里是第五次修改 +这里是第六次修改 \ No newline at end of file