\u6211\u7f16\u8f91\u8fc7\u5f88\u591a\u6587\u672c\u6587\u4ef6\u3002\u6709\u65f6\u662f\u4ee3\u7801\u3002\u5176\u4ed6\u65f6\u5019\u662f\u89d2\u8272\u626e\u6f14\u6e38\u620f\uff08RPG\uff09\u3001\u7f16\u7a0b\u4e66\u7c4d\u6216\u4e00\u822c\u4fe1\u4ef6\u7684\u4e66\u9762\u6587\u5b57\u3002\u6709\u65f6\u5019\uff0c\u505a\u4e00\u4e2a\u4fee\u6539\uff0c\u800c\u80fd\u8ba9\u6211\u7684\u534f\u4f5c\u8005\u628a\u6211\u7684\u4fee\u6539\u548c\u4ed6\u4eec\u539f\u6765\u5199\u7684\u4e1c\u897f\u8fdb\u884c\u6bd4\u8f83\u5c31\u66f4\u597d\u4e86\u3002\u8bb8\u591a\u4eba\u9ed8\u8ba4\u4f7f\u7528\u529e\u516c\u5957\u4ef6\uff08\u5982 LibreOffice\uff09\u7684\u6ce8\u91ca\u6216\u66f4\u6539\u8ddf\u8e2a\u529f\u80fd\u3002\u4e0d\u8fc7\u6709\u65f6\u66f4\u7b80\u5355\u7684\u5de5\u5177\u66f4\u6709\u610f\u4e49\uff0c\u4e3a\u6b64\uff0c\u4f60\u53ef\u4ee5\u770b\u770b\u50cf diff\u00a0\u548c\u00a0patch\u00a0\u8fd9\u6837\u7684\u5de5\u5177\u7684\u7f16\u7a0b\u5386\u53f2\uff0c\u5b83\u4eec\u4e3a\u8ddf\u8e2a\u548c\u5e94\u7528\u5171\u4eab\u6587\u4ef6\u7684\u53d8\u5316\u63d0\u4f9b\u4e86\u6807\u51c6\u5316\u7684\u683c\u5f0f\u3002<\/p>\n

\u5373\u4f7f\u5bf9\u4e8e\u7b80\u5355\u7684\u6587\u4ef6\uff0c\u5728\u540c\u6b65\u4e24\u4e2a\u6587\u4ef6\u65f6\u4e5f\u6709\u590d\u6742\u6027\u3002\u4e00\u4e9b\u9879\u76ee\u88ab\u6539\u53d8\uff0c\u53e6\u4e00\u4e9b\u88ab\u4fdd\u7559\uff0c\u65b0\u7684\u5185\u5bb9\u88ab\u6dfb\u52a0\uff0c\u8fd8\u6709\u4e00\u4e9b\u4fdd\u6301\u4e0d\u53d8\uff0c\u4f46\u88ab\u79fb\u5230\u6587\u4ef6\u7684\u4e0d\u540c\u4f4d\u7f6e\u3002\u5982\u679c\u63a5\u53d7\u6240\u6709\u7684\u53d8\u5316\uff0c\u5e76\u4e14\u7528\u65b0\u6587\u4ef6\u66ff\u6362\u65e7\u6587\u4ef6\uff0c\u5c31\u5f88\u96be\u590d\u5236\u53d8\u5316\u3002\u5b83\u4e5f\u662f\u6574\u4f53\u4e0d\u900f\u660e\u7684\u3002\u5982\u679c\u53d8\u5316\u5f88\u591a\uff0c\u5c31\u5f88\u96be\u6311\u51fa\u5230\u5e95\u53d1\u751f\u4e86\u4ec0\u4e48\u53d8\u5316\u3002<\/p>\n

\u901a\u8fc7\u00a0diff\u00a0\u547d\u4ee4\uff0c\u4f60\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u6587\u4ef6\u53d8\u5316\u7684\u8bb0\u5f55\uff0c\u901a\u8fc7\u00a0patch\u00a0\u4f60\u53ef\u4ee5\u5728\u65e7\u7248\u672c\u4e0a\u201c\u91cd\u653e\u201d\u8fd9\u4e9b\u53d8\u5316\uff0c\u4f7f\u5176\u4e0e\u65b0\u7248\u672c\u4fdd\u6301\u4e00\u81f4\u3002<\/p>\n

\u8bbe\u7f6e<\/strong><\/div>\n
\u5047\u8bbe\u4f60\u548c\u6211\u6b63\u5728\u5408\u4f5c\u7f16\u5199\u4e00\u4e2a\u63cf\u8ff0\u5982\u4f55\u6ce1\u8336\u7684\u6587\u4ef6\u3002<\/p>\n
\u5230\u76ee\u524d\u4e3a\u6b62\uff0c\u6587\u4ef6 tea.md \u5305\u542b\u539f\u59cb\u7684\u590d\u5236\u7c98\u8d34\u6765\u7684\u5185\u5bb9\uff1a<\/p>\n
\u70e7\u5f00\u6c34\u3002
\n\u52a0\u70ed\u8336\u58f6\u3002
\n\u5728\u8336\u58f6\u4e2d\u52a0\u5165\u8336\u548c\u6c34\u3002
\n\u5728\u8336\u58f6\u4e0a\u653e\u7f6e\u4e00\u4e2a\u8336\u53f6\u6ee4\u7f51\u3002
\n\u6d78\u6ce1 6 \u5206\u949f\u3002
\n\u5c06\u8336\u5012\u5165\u676f\u4e2d\u3002
\n\u52a0\u5165\u725b\u5976\u3002
\n\u8fd9\u4f3c\u4e4e\u5f88\u5408\u7406\uff0c\u4f46\u603b\u6709\u4e00\u4e9b\u4f18\u5316\u53ef\u4ee5\u505a\uff0c\u6240\u4ee5\u4f60\u628a\u6587\u4ef6\u53d1\u7ed9\u6211\u6539\u8fdb\u3002\u4e3a\u4e86\u6f84\u6e05\u6ce1\u8336\u8fc7\u7a0b\uff0c\u6211\u628a\u6587\u4ef6\u590d\u5236\u4e3atea-revision.md\uff0c\u5e76\u8fdb\u884c\u7f16\u8f91\uff0c\u6700\u540e\u662f\u8fd9\u6837\u7684\uff1a<\/p>\n
\u5728\u70e4\u7bb1\u7684\u62bd\u5c49\u4e2d\u52a0\u70ed\u8336\u58f6\u3002
\n\u70e7\u5f00\u6c34\u3002
\n\u5c06\u8336\u53f6\u653e\u5165\u8336\u53f6\u6ee4\u7f51\u3002
\n\u5c06\u6ee4\u7f51\u548c\u6c34\u52a0\u5165\u8336\u58f6\u3002
\n\u6d78\u6ce1 6 \u5206\u949f\u3002\u7528\u8336\u58f6\u7f69\u4fdd\u6e29\u3002
\n\u5c06\u8336\u5012\u5165\u676f\u4e2d\u3002
\n\u53ef\u4ee5\u9009\u62e9\u52a0\u5165\u6e29\u725b\u5976\u3002<\/p>\n
\u6b63\u5982\u9884\u671f\u7684\u90a3\u6837\uff0c\u4e00\u4e9b\u9879\u76ee\uff08\u201c\u70e7\u5f00\u6c34\u201d\u548c\u201c\u5c06\u8336\u5012\u5165\u676f\u4e2d\u201d\uff09\u6ca1\u6709\u53d8\u5316\uff0c\u800c\u5176\u4ed6\u884c\uff08\u201c\u52a0\u70ed\u8336\u58f6\u201d\uff09\u5219\u6709\u589e\u52a0\u3002\u6709\u4e9b\u884c\u662f\u5168\u65b0\u7684\uff0c\u6709\u4e9b\u884c\u662f\u76f8\u540c\u7684\uff0c\u4f46\u987a\u5e8f\u4e0d\u540c\u3002<\/p>\n
\u521b\u5efa\u4e00\u4e2a\u5dee\u5f02<\/strong><\/div>\n
diff\u00a0\u5de5\u5177\u4f1a\u663e\u793a\u4e24\u4e2a\u6587\u4ef6\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u6709\u51e0\u79cd\u4e0d\u540c\u7684\u65b9\u6cd5\u6765\u67e5\u770b\u7ed3\u679c\uff0c\u4f46\u6211\u8ba4\u4e3a\u6700\u6e05\u695a\u7684\u662f\u00a0\u2014unified\uff08\u7b80\u5199\u4e3a\u00a0-u\uff09\u89c6\u56fe\uff0c\u5b83\u663e\u793a\u54ea\u4e9b\u884c\u88ab\u589e\u52a0\u6216\u51cf\u5c11\u4e86\u3002\u4ee5\u4efb\u4f55\u65b9\u5f0f\u6539\u53d8\u7684\u884c\u90fd\u88ab\u89c6\u4e3a\u5148\u51cf\u540e\u589e\u7684\u884c\u3002\u9ed8\u8ba4\u60c5\u51b5\u4e0b\uff0cdiff\u00a0\u5c06\u5176\u8f93\u51fa\u6253\u5370\u5230\u7ec8\u7aef\u3002<\/p>\n
\u5411\u00a0diff\u00a0\u63d0\u4f9b\u65e7\u6587\u4ef6\uff0c\u7136\u540e\u662f\u65b0\u6587\u4ef6\uff1a<\/p>\n
$ diff --unified tea.md tea-revised.md\u00a0\r\n--- tea.md \u00a0 \u00a0 \u00a02021-11-13 10:26:25.082110219 +1300\r\n+++ tea-revised.md \u00a0 \u00a0 \u00a02021-11-13 10:26:32.049110664 +1300\r\n@@ -1,7 +1,7 @@\r\n+\u5728\u70e4\u7bb1\u7684\u62bd\u5c49\u4e2d\u52a0\u70ed\u8336\u58f6\u3002\r\n\u70e7\u5f00\u6c34\u3002\r\n-\u52a0\u70ed\u8336\u58f6\u3002\r\n-\u5728\u8336\u58f6\u4e2d\u52a0\u5165\u8336\u548c\u6c34\u3002\r\n-\u5728\u8336\u58f6\u4e0a\u653e\u7f6e\u4e00\u4e2a\u8336\u53f6\u6ee4\u7f51\u3002\r\n-\u6d78\u6ce1 6 \u5206\u949f\u3002\r\n+\u5c06\u8336\u53f6\u653e\u5165\u8336\u53f6\u6ee4\u7f51\u3002\r\n+\u5c06\u6ee4\u7f51\u548c\u6c34\u52a0\u5165\u8336\u58f6\u3002\r\n+\u6d78\u6ce1 6 \u5206\u949f\u3002\u7528\u8336\u58f6\u7f69\u4fdd\u6e29\u3002\r\n\u00a0\u5c06\u8336\u5012\u5165\u676f\u4e2d\u3002\r\n-\u52a0\u5165\u725b\u5976\u3002\r\n+\u53ef\u4ee5\u9009\u62e9\u52a0\u5165\u6e29\u725b\u5976\u3002<\/pre>\n
\u884c\u9996\u7684\u52a0\u53f7\uff08+\uff09\u8868\u793a\u5728\u65e7\u6587\u4ef6\u4e2d\u589e\u52a0\u4e86\u4e00\u4e9b\u5185\u5bb9\u3002\u884c\u9996\u7684\u51cf\u53f7\uff08-\uff09\u8868\u793a\u88ab\u5220\u9664\u6216\u6539\u53d8\u7684\u884c\u3002<\/p>\n
\u7528 diff \u521b\u5efa\u4e00\u4e2a\u8865\u4e01<\/strong><\/div>\n
\u8865\u4e01\u6587\u4ef6\u5c31\u662f\u5c06\u00a0diff \u2014unified\u00a0\u547d\u4ee4\u7684\u8f93\u51fa\u653e\u5230\u4e00\u4e2a\u6587\u4ef6\u4e2d\u3002\u4f60\u53ef\u4ee5\u7528\u6807\u51c6\u7684 Bash \u91cd\u5b9a\u5411\u6765\u505a\u8fd9\u4ef6\u4e8b\uff1a<\/p>\n
$ diff -u tea.md tea-revised.md > tea.patch<\/pre>\n
\u8be5\u6587\u4ef6\u7684\u5185\u5bb9\u4e0e\u8f93\u51fa\u5230\u7ec8\u7aef\u7684\u5185\u5bb9\u5b8c\u5168\u76f8\u540c\u3002\u6211\u559c\u6b22\u5728\u00a0Emacs\u00a0\u4e2d\u67e5\u770b\u8865\u4e01\u6587\u4ef6\uff0c\u5b83\u5bf9\u6bcf\u4e00\u884c\u8fdb\u884c\u989c\u8272\u7f16\u7801\uff0c\u53d6\u51b3\u4e8e\u5b83\u662f\u88ab\u6dfb\u52a0\u8fd8\u662f\u88ab\u51cf\u53bb\u3002<\/p>\n
$\"\"$ <\/p>\n
<\/p>\n
Emacs\u4e2d\u7684\u8865\u4e01\u6587\u4ef6<\/em><\/p>\n
\u7528\u8865\u4e01\u5e94\u7528\u4fee\u6539<\/strong><\/div>\n
\u4e00\u65e6\u6211\u6709\u4e86\u8865\u4e01\u6587\u4ef6\uff0c\u6211\u5c31\u53ef\u4ee5\u628a\u5b83\u53d1\u7ed9\u4f60\uff0c\u8ba9\u4f60\u5ba1\u67e5\uff0c\u5e76\u4e14\u53ef\u4ee5\u9009\u62e9\u5e94\u7528\u5230\u4f60\u7684\u65e7\u6587\u4ef6\u4e2d\u3002\u4f60\u53ef\u4ee5\u7528\u00a0patch\u00a0\u547d\u4ee4\u6765\u5e94\u7528\u4e00\u4e2a\u8865\u4e01\u3002<\/p>\n
$ patch tea.md tea.patch<\/pre>\n
\u589e\u52a0\u4e86\u4e00\u4e9b\u884c\uff0c\u51cf\u5c11\u4e86\u4e00\u4e9b\u884c\uff0c\u6700\u540e\uff0c\u4f60\u5f97\u5230\u4e86\u4e00\u4e2a\u4e0e\u6211\u7684\u7248\u672c\u76f8\u540c\u7684\u6587\u4ef6\uff1a<\/p>\n
$ cat tea.md\r\n\u5728\u70e4\u7bb1\u7684\u62bd\u5c49\u4e2d\u52a0\u70ed\u8336\u58f6\u3002\r\n\u70e7\u5f00\u6c34\u3002\r\n\u5c06\u8336\u53f6\u653e\u5165\u8336\u53f6\u6ee4\u7f51\u3002\r\n\u5c06\u6ee4\u7f51\u548c\u6c34\u52a0\u5165\u8336\u58f6\u3002\r\n\u6d78\u6ce1 6 \u5206\u949f\u3002\u7528\u8336\u58f6\u7f69\u4fdd\u6e29\u3002\r\n\u5c06\u8336\u5012\u5165\u676f\u4e2d\u3002\r\n\u53ef\u4ee5\u9009\u62e9\u52a0\u5165\u6e29\u725b\u5976\u3002<\/pre>\n
\u4f60\u53ef\u4ee5\u7ed9\u4e00\u4e2a\u6587\u4ef6\u6253\u591a\u5c11\u6b21\u8865\u4e01\uff0c\u8fd9\u662f\u6ca1\u6709\u9650\u5236\u7684\u3002\u4f60\u53ef\u4ee5\u5bf9\u6211\u7684\u4fee\u6539\u8fdb\u884c\u8fed\u4ee3\uff0c\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u8865\u4e01\uff0c\u7136\u540e\u53d1\u7ed9\u6211\u5ba1\u6838\u3002\u53d1\u9001\u4fee\u6539\u5185\u5bb9\u800c\u4e0d\u662f\u7ed3\u679c\uff0c\u53ef\u4ee5\u8ba9\u6bcf\u4e2a\u8d21\u732e\u8005\u5ba1\u67e5\u4fee\u6539\u7684\u5185\u5bb9\uff0c\u51b3\u5b9a\u4ed6\u4eec\u8981\u4fdd\u7559\u6216\u5220\u9664\u7684\u5185\u5bb9\uff0c\u5e76\u51c6\u786e\u5730\u8bb0\u5f55\u8fc7\u7a0b\u3002<\/p>\n
\u5b89\u88c5<\/strong><\/div>\n
\u5728 Linux \u548c macOS \u4e0a\uff0c\u4f60\u5df2\u7ecf\u6709\u4e86\u00a0diff\u00a0\u548c\u00a0patch\u00a0\u547d\u4ee4\u3002\u5728 Windows \u4e0a\uff0c\u4f60\u53ef\u4ee5\u901a\u8fc7\u00a0Cygwin\u00a0\u83b7\u5f97\u00a0diff\u00a0\u548c\u00a0patch\uff0c\u6216\u8005\u4f7f\u7528 Chocolatey \u641c\u7d22\u00a0diffutils\u00a0\u548c\u00a0patch\u3002<\/p>\n
\u5982\u679c\u4f60\u66fe\u7ecf\u8bd5\u56fe\u901a\u8fc7\u7535\u5b50\u90ae\u4ef6\u6216\u804a\u5929\u6765\u534f\u4f5c\u5904\u7406\u6587\u4ef6\uff0c\u5e76\u4e14\u53d1\u73b0\u81ea\u5df1\u9700\u8981\u00a0\u63cf\u8ff0\u00a0\u9700\u8981\u4fee\u6539\u7684\u5730\u65b9\uff0c\u90a3\u4e48\u4f60\u4f1a\u559c\u6b22\u00a0diff\u00a0\u548c\u00a0patch\u3002\u4e00\u4e2a\u7ed3\u6784\u4e25\u8c28\u7684\u6587\u4ef6\uff0c\u5982\u4ee3\u7801\u6216\u4ee5\u884c\u4e3a\u5355\u4f4d\u7684\u00a0Markdown\uff0c\u5f88\u5bb9\u6613\u8fdb\u884c\u5dee\u5f02\u6bd4\u8f83\u3001\u8865\u4e01\u548c\u7ef4\u62a4\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
\u6211\u7f16\u8f91\u8fc7\u5f88\u591a\u6587\u672c\u6587\u4ef6\u3002\u6709\u65f6\u662f\u4ee3\u7801\u3002\u5176\u4ed6\u65f6\u5019\u662f\u89d2\u8272\u626e\u6f14\u6e38\u620f\uff08RPG\uff09\u3001\u7f16\u7a0b\u4e66\u7c4d\u6216\u4e00\u822c\u4fe1\u4ef6\u7684\u4e66\u9762\u6587\u5b57\u3002\u6709\u65f6\u5019\uff0c\u505a\u4e00 […]<\/p>\n","protected":false},"author":323,"featured_media":216064,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[55],"tags":[],"class_list":["post-232042","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-thread"],"acf":[],"_links":{"self":[{"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/posts\/232042","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/users\/323"}],"replies":[{"embeddable":true,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/comments?post=232042"}],"version-history":[{"count":1,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/posts\/232042\/revisions"}],"predecessor-version":[{"id":232044,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/posts\/232042\/revisions\/232044"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/media\/216064"}],"wp:attachment":[{"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/media?parent=232042"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/categories?post=232042"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/gulass.cn\/wp-json\/wp\/v2\/tags?post=232042"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}