{"id":4202,"date":"2019-07-26T23:43:36","date_gmt":"2019-07-26T15:43:36","guid":{"rendered":"https:\/\/www.linuxcool.com\/?p=4202"},"modified":"2019-07-26T23:43:38","modified_gmt":"2019-07-26T15:43:38","slug":"diff3","status":"publish","type":"post","link":"https:\/\/www.linuxcool.com\/diff3","title":{"rendered":"diff3\u547d\u4ee4 – \u6bd4\u8f833\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u4e4b\u5904"},"content":{"rendered":"\n

diff3\u547d\u4ee4\u7528\u4e8e\u6bd4\u8f833\u4e2a\u6587\u4ef6\uff0c\u5c063\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u7684\u5730\u65b9\u663e\u793a\u5230\u6807\u51c6\u8f93\u51fa\u3002<\/p>\n\n\n\n

\u8bed\u6cd5\u683c\u5f0f\uff1a<\/strong>diff3 [\u53c2\u6570]<\/p>\n\n\n\n

\u5e38\u7528\u53c2\u6570\uff1a<\/strong><\/p>\n\n\n\n
-A<\/td>\u5168\u90e8\u663e\u793a\uff0c\u6709\u51b2\u7a81\u5185\u5bb9\u7528\u62ec\u53f7\u62ec\u8d77\u6765<\/td><\/tr>
-a<\/td>\u5c06\u6240\u6709\u6587\u4ef6\u89c6\u4e3a\u6587\u672c<\/td><\/tr>
-T<\/td>\u4f7f\u5236\u8868\u7b26\u5bf9\u9f50<\/td><\/tr><\/tbody><\/table>\n\n\n\n

\u53c2\u8003\u5b9e\u4f8b<\/strong><\/p>\n\n\n\n

\u6bd4\u8f833\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u4e4b\u5904\uff1a<\/p>\n\n\n\n

[root@linuxcool ~]# diff3 file1 file2 file3<\/pre>\n\n\n\n

\u5168\u90e8\u663e\u793a\uff0c\u6709\u51b2\u7a81\u5185\u5bb9\u7528\u62ec\u53f7\u62ec\u8d77\u6765\uff1a<\/p>\n\n\n\n

[root@linuxcool ~]# diff3 -A file1 file2 file3<\/pre>\n\n\n\n

\u5c06\u6240\u6709\u6587\u4ef6\u89c6\u4e3a\u6587\u672c\uff1a<\/p>\n\n\n\n

[root@linuxcool ~]# diff3 -a file1 file2 file3<\/pre>\n\n\n\n

\u4f7f\u5236\u8868\u7b26\u5bf9\u9f50\uff1a<\/p>\n\n\n\n

[root@linuxcool ~]# diff3 -T file1 file2 file3<\/pre>\n","protected":false},"excerpt":{"rendered":"

diff3\u547d\u4ee4\u7528\u4e8e\u6bd4\u8f833\u4e2a\u6587\u4ef6\uff0c\u5c063\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u7684\u5730\u65b9\u663e\u793a\u5230\u6807\u51c6\u8f93\u51fa\u3002 \u8bed\u6cd5\u683c\u5f0f\uff1adiff3 [\u53c2\u6570] \u5e38\u7528\u53c2 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[1],"tags":[],"_links":{"self":[{"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/posts\/4202"}],"collection":[{"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/comments?post=4202"}],"version-history":[{"count":7,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/posts\/4202\/revisions"}],"predecessor-version":[{"id":4302,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/posts\/4202\/revisions\/4302"}],"wp:attachment":[{"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/media?parent=4202"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/categories?post=4202"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.linuxcool.com\/wp-json\/wp\/v2\/tags?post=4202"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}