{"id":850,"date":"2020-07-01T02:59:49","date_gmt":"2020-07-01T02:59:49","guid":{"rendered":"http:\/\/www.liutianfeng.com\/?p=850"},"modified":"2020-07-01T02:59:49","modified_gmt":"2020-07-01T02:59:49","slug":"diff%e5%91%bd%e4%bb%a4%e4%b8%ad%e5%b8%b8%e8%a7%81%e7%9a%84%e9%80%89%e9%a1%b9","status":"publish","type":"post","link":"https:\/\/www.liutianfeng.com\/?p=850","title":{"rendered":"diff\u547d\u4ee4\u4e2d\u5e38\u89c1\u7684\u9009\u9879"},"content":{"rendered":"

diff\u547d\u4ee4\u901a\u5e38\u7528\u6765\u6bd4\u5bf9\u4e24\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\uff0c\u5982\u679c\u6709\u5f02\u5e38\uff0c\u8fd4\u56de\u4e0d\u4e00\u81f4\u7684\u5185\u5bb9\uff0cecho $?\u7684\u8fd4\u56de\u503c\u4e5f\u662f\u975e\u96f6\u7684\u3002<\/p>\n

\u6709\u65f6\u5019\uff0c\u56e0\u4e3a\u6587\u6863\u7684\u987a\u5e8f\u539f\u56e0\uff0c\u6216\u8005\u884c\u6570\u4e0d\u540c\u7684\u539f\u56e0\uff0c\u5bfc\u81f4diff\u7684\u7ed3\u679c\u4e2d\u6709\u4e00\u4e9b\u5176\u5b9e\u662f\u4e00\u81f4\u7684\u5185\u5bb9\uff0c\u8fd9\u5c31\u9700\u8981\u8fdb\u884c\u4e00\u5b9a\u7684\u64cd\u4f5c\uff0c\u5e76\u5728diff\u4e2d\u6dfb\u52a0\u5fc5\u8981\u7684\u9009\u9879\uff1a<\/p>\n

1. \u6392\u5e8f<\/h4>\n

\u7ed9\u6587\u6863\u8fdb\u884c\u6392\u5e8f\uff0c\u8fd9\u6837\u80fd\u907f\u514d\u56e0\u4e3a\u987a\u5e8f\u4e0d\u4e00\u81f4\u5bfc\u81f4\u7684\u5f02\u5e38\uff1b<\/p>\n

2. \u53bb\u6389\u7a7a\u884c<\/h4>\n

sed -i ‘^$d’ lius.txt<\/p>\n

3. \u6dfb\u52a0\u5fc5\u8981\u7684\u9009\u9879<\/h4>\n

diff -y –suppress-common-lines<\/p>\n

-y\uff1a\u7ad6\u5411\u663e\u793a\uff0c\u66f4\u52a0\u53cb\u597d<\/p>\n

–suppress-common-lines\uff1a\u5ffd\u7565\u76f8\u540c\u7684\u884c<\/p>\n

 <\/p>\n

\u4f8b\u5b50\uff1a<\/strong><\/p>\n

> cat a.txt\r\naaa\r\nccc\r\nddd\r\n> cat b.txt\r\naaa\r\nbbb\r\nddd\r\n> diff a.txt b.txt  # \u6a2a\u5411\u663e\u793a\uff0c\u7ed3\u679c\u4e0d\u660e\u663e\r\n2c2\r\n< ccc\r\n---\r\n> bbb\r\n> diff -y a.txt b.txt   # -y\u7ad6\u5411\u5411\u5bf9\u6bd4\u663e\u793a\uff0c\u91cd\u590d\u9879\u4e5f\u5217\u51fa\r\naaa\t\t\t\t\t\t\t\taaa\r\nccc\t\t\t\t\t\t\t       |bbb\r\nddd\t\t\t\t\t\t\t\tddd\r\n> diff -y --suppress-common-lines a.txt b.txt  # --suppress-common-lines\u8fc7\u6ee4\u91cd\u590d\u9879\r\nccc\t\t\t\t\t\t\t       |bbb<\/code><\/pre>\n
 <\/p>\n
\u8f6c\u8f7d\u8bf7\u6ce8\u660e\uff1aliutianfeng.com<\/a> » diff\u547d\u4ee4\u4e2d\u5e38\u89c1\u7684\u9009\u9879<\/a><\/p>","protected":false},"excerpt":{"rendered":"
diff\u547d\u4ee4\u901a\u5e38\u7528\u6765\u6bd4\u5bf9\u4e24\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\uff0c\u5982\u679c\u6709\u5f02\u5e38\uff0c\u8fd4\u56de\u4e0d\u4e00\u81f4\u7684\u5185\u5bb9\uff0cecho $?\u7684\u8fd4\u56de\u503c\u4e5f\u662f\u975e\u96f6\u7684\u3002 \u6709\u65f6 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[31],"tags":[],"_links":{"self":[{"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/posts\/850"}],"collection":[{"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=850"}],"version-history":[{"count":1,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/posts\/850\/revisions"}],"predecessor-version":[{"id":851,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=\/wp\/v2\/posts\/850\/revisions\/851"}],"wp:attachment":[{"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=850"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=850"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.liutianfeng.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=850"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}