{"id":613,"date":"2019-10-23T15:11:59","date_gmt":"2019-10-23T07:11:59","guid":{"rendered":"https:\/\/www.linuxdevops.cn\/?p=613"},"modified":"2019-10-23T15:22:59","modified_gmt":"2019-10-23T07:22:59","slug":"diff-command-details","status":"publish","type":"post","link":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/","title":{"rendered":"diff \u547d\u4ee4\u8be6\u89e3"},"content":{"rendered":"\n

1.\u6982\u8ff0<\/h3>\n\n\n\n

  windows\u7cfb\u7edf\u4e0b\u9762\u5c31\u6709\u4e0d\u9519\u7684\u6587\u672c\u5bf9\u6bd4\u5de5\u5177\u53ef\u4ee5\u4f7f\u7528\uff0c\u4f8b\u5982\u5e38\u7528\u7684Beyond Compare\uff0cWinMerge\u90fd\u662f\u56fe\u5f62\u754c\u9762\u7684\u6bd4\u8f83\u5de5\u5177\u800c\u4e14\u4f7f\u7528\u975e\u5e38\u65b9\u4fbf\uff0c\u5982\u679c\u4f60\u4ec5\u4ec5\u662f\u5728windows\u4e0b\u5de5\u4f5c\uff0c\u8fd9\u4e9bGUI\u7684\u6bd4\u8f83\u5de5\u5177\u7edd\u5bf9\u662f\u9996\u9009\u3002\u5bf9\u4e8e\u5728linux\u73af\u5883\u4e0b\u5de5\u4f5c\u7684\u4eba\u6765\u8bf4\uff0c\u5982\u679c\u6bcf\u6b21\u60f3\u770b\u4e24\u4e2a\u6587\u4ef6\u7684\u533a\u522b\u90fd\u8981\u5c06\u6587\u4ef6\u4e0b\u8f7d\u5230windows\u73af\u5883\u7136\u540e\u7528\u56fe\u5f62\u5de5\u5177\u8fdb\u884c\u6bd4\u8f83\u5b9e\u5728\u662f\u592a\u9ebb\u70e6\u4e86\u3002\u90a3\u4e48\u6211\u4eec\u5fc5\u987b\u5b66\u4f1a\u4f7f\u7528linux\u73af\u5883\u4e0b\u7684\u6bd4\u8f83\u5de5\u5177 diff\u3002<\/p>\n\n\n\n

diff\u547d\u4ee4\u5728\u6700\u7b80\u5355\u7684\u60c5\u51b5\u4e0b\uff0c\u6bd4\u8f83\u7ed9\u5b9a\u7684\u4e24\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u3002\u5982\u679c\u4f7f\u7528\u201c-\u201d\u4ee3\u66ff\u201c\u6587\u4ef6\u201d\u53c2\u6570\uff0c\u5219\u8981\u6bd4\u8f83\u7684\u5185\u5bb9\u5c06\u6765\u81ea\u6807\u51c6\u8f93\u5165\u3002diff\u547d\u4ee4\u662f\u4ee5\u9010\u884c\u7684\u65b9\u5f0f\uff0c\u6bd4\u8f83\u6587\u672c\u6587\u4ef6\u7684\u5f02\u540c\u5904\u3002\u5982\u679c\u8be5\u547d\u4ee4\u6307\u5b9a\u8fdb\u884c\u76ee\u5f55\u7684\u6bd4\u8f83\uff0c\u5219\u5c06\u4f1a\u6bd4\u8f83\u8be5\u76ee\u5f55\u4e2d\u5177\u6709\u76f8\u540c\u6587\u4ef6\u540d\u7684\u6587\u4ef6\uff0c\u800c\u4e0d\u4f1a\u5bf9\u5176\u5b50\u76ee\u5f55\u6587\u4ef6\u8fdb\u884c\u4efb\u4f55\u6bd4\u8f83\u64cd\u4f5c\u3002<\/p>\n\n\n\n

\u8bed\u6cd5<\/h3>\n\n\n\n
diff(\u9009\u9879)(\u53c2\u6570)<\/pre>\n\n\n\n
\u9009\u9879<\/h3>\n\n\n\n
-<\u884c\u6570>\uff1a\u6307\u5b9a\u8981\u663e\u793a\u591a\u5c11\u884c\u7684\u6587\u672c\u3002\u6b64\u53c2\u6570\u5fc5\u987b\u4e0e-c\u6216-u\u53c2\u6570\u4e00\u5e76\u4f7f\u7528\uff1b\n-a\u6216\u2014\u2014text\uff1adiff\u9884\u8bbe\u53ea\u4f1a\u9010\u884c\u6bd4\u8f83\u6587\u672c\u6587\u4ef6\uff1b\n-b\u6216--ignore-space-change\uff1a\u4e0d\u68c0\u67e5\u7a7a\u683c\u5b57\u7b26\u7684\u4e0d\u540c\uff1b\n-B\u6216--ignore-blank-lines\uff1a\u4e0d\u68c0\u67e5\u7a7a\u767d\u884c\uff1b\n-c\uff1a\u663e\u793a\u5168\u90e8\u5185\u5bb9\uff0c\u5e76\u6807\u51fa\u4e0d\u540c\u4e4b\u5904\uff1b\n-C<\u884c\u6570>\u6216--context<\u884c\u6570>\uff1a\u4e0e\u6267\u884c\u201c-c-<\u884c\u6570>\u201d\u6307\u4ee4\u76f8\u540c\uff1b\n-d\u6216\u2014\u2014minimal\uff1a\u4f7f\u7528\u4e0d\u540c\u7684\u6f14\u7b97\u6cd5\uff0c\u4ee5\u5c0f\u7684\u5355\u4f4d\u6765\u505a\u6bd4\u8f83\uff1b\n-D<\u5de8\u96c6\u540d\u79f0>\u6216ifdef<\u5de8\u96c6\u540d\u79f0>\uff1a\u6b64\u53c2\u6570\u7684\u8f93\u51fa\u683c\u5f0f\u53ef\u7528\u4e8e\u524d\u7f6e\u5904\u7406\u5668\u5de8\u96c6\uff1b\n-e\u6216\u2014\u2014ed<\/a>\uff1a\u6b64\u53c2\u6570\u7684\u8f93\u51fa\u683c\u5f0f\u53ef\u7528\u4e8eed\u7684script\u6587\u4ef6\uff1b\n-f\u6216-forward-ed\uff1a\u8f93\u51fa\u7684\u683c\u5f0f\u7c7b\u4f3ced\u7684script\u6587\u4ef6\uff0c\u4f46\u6309\u7167\u539f\u6765\u6587\u4ef6\u7684\u987a\u5e8f\u6765\u663e\u793a\u4e0d\u540c\u5904\uff1b\n-H\u6216--speed-large-files\uff1a\u6bd4\u8f83\u5927\u6587\u4ef6\u65f6\uff0c\u53ef\u52a0\u5feb\u901f\u5ea6\uff1b\n-l<\u5b57\u7b26\u6216\u5b57\u7b26\u4e32>\u6216--ignore-matching-lines<\u5b57\u7b26\u6216\u5b57\u7b26\u4e32>\uff1a\u82e5\u4e24\u4e2a\u6587\u4ef6\u5728\u67d0\u51e0\u884c\u6709\u6240\u4e0d\u540c\uff0c\u800c\u4e4b\u9645\u822a\u540c\u65f6\u90fd\u5305\u542b\u4e86\u9009\u9879\u4e2d\u6307\u5b9a\u7684\u5b57\u7b26\u6216\u5b57\u7b26\u4e32\uff0c\u5219\u4e0d\u663e\u793a\u8fd9\u4e24\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\uff1b\n-i\u6216--ignore-case\uff1a\u4e0d\u68c0\u67e5\u5927\u5c0f\u5199\u7684\u4e0d\u540c\uff1b\n-l\u6216\u2014\u2014paginate\uff1a\u5c06\u7ed3\u679c\u4ea4\u7531pr<\/a>\u7a0b\u5e8f\u6765\u5206\u9875\uff1b\n-n\u6216\u2014\u2014rcs\uff1a\u5c06\u6bd4\u8f83\u7ed3\u679c\u4ee5RCS\u7684\u683c\u5f0f\u6765\u663e\u793a\uff1b\n-N\u6216--new-file<\/a>\uff1a\u5728\u6bd4\u8f83\u76ee\u5f55\u65f6\uff0c\u82e5\u6587\u4ef6A\u4ec5\u51fa\u73b0\u5728\u67d0\u4e2a\u76ee\u5f55\u4e2d\uff0c\u9884\u8bbe\u4f1a\u663e\u793a\uff1aOnly in\u76ee\u5f55\uff0c\u6587\u4ef6A \u82e5\u4f7f\u7528-N\u53c2\u6570\uff0c\u5219diff\u4f1a\u5c06\u6587\u4ef6A \u4e0e\u4e00\u4e2a\u7a7a\u767d\u7684\u6587\u4ef6\u6bd4\u8f83\uff1b\n-p\uff1a\u82e5\u6bd4\u8f83\u7684\u6587\u4ef6\u4e3aC\u8bed\u8a00\u7684\u7a0b\u5e8f\u7801\u6587\u4ef6\u65f6\uff0c\u663e\u793a\u5dee\u5f02\u6240\u5728\u7684\u51fd\u6570\u540d\u79f0\uff1b\n-P\u6216--unidirectional-new-file\uff1a\u4e0e-N\u7c7b\u4f3c\uff0c\u4f46\u53ea\u6709\u5f53\u7b2c\u4e8c\u4e2a\u76ee\u5f55\u5305\u542b\u4e86\u7b2c\u4e00\u4e2a\u76ee\u5f55\u6240\u6ca1\u6709\u7684\u6587\u4ef6\u65f6\uff0c\u624d\u4f1a\u5c06\u8fd9\u4e2a\u6587\u4ef6\u4e0e\u7a7a\u767d\u7684\u6587\u4ef6\u505a\u6bd4\u8f83\uff1b\n-q\u6216--brief\uff1a\u4ec5\u663e\u793a\u6709\u65e0\u5dee\u5f02\uff0c\u4e0d\u663e\u793a\u8be6\u7ec6\u7684\u4fe1\u606f\uff1b\n-r\u6216\u2014\u2014recursive\uff1a\u6bd4\u8f83\u5b50\u76ee\u5f55\u4e2d\u7684\u6587\u4ef6\uff1b\n-s\u6216--report-identical-files\uff1a\u82e5\u6ca1\u6709\u53d1\u73b0\u4efb\u4f55\u5dee\u5f02\uff0c\u4ecd\u7136\u663e\u793a\u4fe1\u606f\uff1b\n-S<\u6587\u4ef6>\u6216--starting-file<\u6587\u4ef6>\uff1a\u5728\u6bd4\u8f83\u76ee\u5f55\u65f6\uff0c\u4ece\u6307\u5b9a\u7684\u6587\u4ef6\u5f00\u59cb\u6bd4\u8f83\uff1b\n-t\u6216--expand<\/a>-tabs\uff1a\u5728\u8f93\u51fa\u65f6\uff0c\u5c06tab\u5b57\u7b26\u5c55\u5f00\uff1b\n-T\u6216--initial-tab\uff1a\u5728\u6bcf\u884c\u524d\u9762\u52a0\u4e0atab\u5b57\u7b26\u4ee5\u4fbf\u5bf9\u9f50\uff1b\n-u\uff0c-U<\u5217\u6570>\u6216--unified=<\u5217\u6570>\uff1a\u4ee5\u5408\u5e76\u7684\u65b9\u5f0f\u6765\u663e\u793a\u6587\u4ef6\u5185\u5bb9\u7684\u4e0d\u540c\uff1b\n-v\u6216\u2014\u2014version\uff1a\u663e\u793a\u7248\u672c\u4fe1\u606f\uff1b\n-w<\/a>\u6216--ignore-all-space\uff1a\u5ffd\u7565\u5168\u90e8\u7684\u7a7a\u683c\u5b57\u7b26\uff1b\n-W<\u5bbd\u5ea6>\u6216--width<\u5bbd\u5ea6>\uff1a\u5728\u4f7f\u7528-y\u53c2\u6570\u65f6\uff0c\u6307\u5b9a\u680f\u5bbd\uff1b\n-x<\u6587\u4ef6\u540d\u6216\u76ee\u5f55>\u6216--exclude<\u6587\u4ef6\u540d\u6216\u76ee\u5f55>\uff1a\u4e0d\u6bd4\u8f83\u9009\u9879\u4e2d\u6240\u6307\u5b9a\u7684\u6587\u4ef6\u6216\u76ee\u5f55\uff1b\n-X<\u6587\u4ef6>\u6216--exclude-from<\u6587\u4ef6>\uff1b\u60a8\u53ef\u4ee5\u5c06\u6587\u4ef6\u6216\u76ee\u5f55\u7c7b\u578b\u5b58\u6210\u6587\u672c\u6587\u4ef6\uff0c\u7136\u540e\u5728=<\u6587\u4ef6>\u4e2d\u6307\u5b9a\u6b64\u6587\u672c\u6587\u4ef6\uff1b\n-y\u6216--side-by-side\uff1a\u4ee5\u5e76\u5217\u7684\u65b9\u5f0f\u663e\u793a\u6587\u4ef6\u7684\u5f02\u540c\u4e4b\u5904\uff1b\n--help<\/a>\uff1a\u663e\u793a\u5e2e\u52a9\uff1b\n--left-column\uff1a\u5728\u4f7f\u7528-y\u53c2\u6570\u65f6\uff0c\u82e5\u4e24\u4e2a\u6587\u4ef6\u67d0\u4e00\u884c\u5185\u5bb9\u76f8\u540c\uff0c\u5219\u4ec5\u5728\u5de6\u4fa7\u7684\u680f\u4f4d\u663e\u793a\u8be5\u884c\u5185\u5bb9\uff1b\n--suppress-common-lines\uff1a\u5728\u4f7f\u7528-y\u53c2\u6570\u65f6\uff0c\u4ec5\u663e\u793a\u4e0d\u540c\u4e4b\u5904\u3002<\/pre>\n\n\n\n
\u8fd8\u6709\u4e2acolordiff\u547d\u4ee4\uff0c\u7528\u989c\u8272\u6807\u8bc6\u4e0d\u540c\u7684\u5730\u65b9\u3002\u9700\u8981\u5148\u5b89\u88c5<\/strong><\/p>\n\n\n\n
2.diff\u5982\u4f55\u5de5\u4f5c\uff0c\u5982\u4f55\u7406\u89e3diff\u7684\u6267\u884c\u7ed3\u679c<\/h3>\n\n\n\n
diff\u5206\u6790\u4e24\u4e2a\u6587\u4ef6\uff0c\u5e76\u8f93\u51fa\u4e24\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u7684\u884c\u3002diff\u7684\u8f93\u51fa\u7ed3\u679c\u8868\u660e\u9700\u8981\u5bf9\u4e00\u4e2a\u6587\u4ef6\u505a\u600e\u6837\u7684\u64cd\u4f5c\u4e4b\u540e\u624d\u80fd\u4e0e\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u76f8\u5339\u914d\u3010\u6216\u8005\u8fd9\u4e48\u7406\u89e3\uff1a\u4e0e\u7b2c\u4e00\u4e2a\u6587\u4ef6\u76f8\u6bd4\uff0c\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u53d1\u751f\u4e86\u90a3\u4e9b\u53d8\u5316\u3011\u3010git diff\u7684\u7ed3\u679c\u8f93\u51fa\u4e5f\u662f\u5982\u6b64\u3011<\/strong>\u3002diff\u5e76\u4e0d\u4f1a\u6539\u53d8\u6587\u4ef6\u7684\u5185\u5bb9\uff0c\u4f46\u662fdiff\u53ef\u4ee5\u8f93\u51fa\u4e00\u4e2aed\u811a\u672c\u6765\u5e94\u7528\u8fd9\u4e9b\u6539\u53d8\u3002
\u73b0\u5728\u8ba9\u6211\u4eec\u6765\u770b\u4e00\u4e0bdiff\u662f\u5982\u4f55\u5de5\u4f5c\u7684\uff0c\u5047\u8bbe\u6709\u4e24\u4e2a\u6587\u4ef6\uff1a<\/p>\n\n\n\n
\/\/file1.txt
I need to buy apples.
I need to run the laundry.
I need to wash the dog.
I need to get the car detailed.

\/\/file2.txt
I need to buy apples.
I need to do the laundry.
I need to wash the car.
I need to get the dog detailed.<\/p>\n\n\n\n
\u6211\u4eec\u4f7f\u7528diff\u6bd4\u8f83\u4ed6\u4eec\u7684\u4e0d\u540c\uff1a
diff file1.txt file2.txt<\/p>\n\n\n\n
\u8f93\u51fa\u5982\u4e0b\u7ed3\u679c\uff1a
2,4c2,4
< I need to run the laundry.
< I need to wash the dog.
< I need to get the car detailed.
---
> I need to do the laundry.
> I need to wash the car.
> I need to get the dog detailed.<\/p>\n\n\n\n
\u6211\u4eec\u6765\u8bf4\u660e\u4e00\u4e0b\u8be5\u8f93\u51fa\u7ed3\u679c\u7684\u542b\u4e49\uff0c\u8981\u660e\u767ddiff\u6bd4\u8f83\u7ed3\u679c\u7684\u542b\u4e49\uff0c\u6211\u4eec\u5fc5\u987b\u7262\u8bb0\u4e00\u70b9\uff0cdiff\u63cf\u8ff0\u4e24\u4e2a\u6587\u4ef6\u4e0d\u540c\u7684\u65b9\u5f0f\u662f\u544a\u8bc9\u6211\u4eec\u600e\u4e48\u6837\u6539\u53d8\u7b2c\u4e00\u4e2a\u6587\u4ef6\u4e4b\u540e\u4e0e\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u5339\u914d\u3002\u6211\u4eec\u770b\u770b\u4e0a\u9762\u7684\u6bd4\u8f83\u7ed3\u679c\u4e2d\u7684\u7b2c\u4e00\u884c 2,4c2,4 \u524d\u9762\u7684\u6570\u5b572,4\u8868\u793a\u7b2c\u4e00\u4e2a\u6587\u4ef6\u4e2d\u7684\u884c\uff0c\u4e2d\u95f4\u6709\u4e00\u4e2a\u5b57\u6bcdc\u8868\u793a\u9700\u8981\u5728\u7b2c\u4e00\u4e2a\u6587\u4ef6\u4e0a\u505a\u7684\u64cd\u4f5c(a=add,c=change,d=delete)\uff0c\u540e\u9762\u7684\u6570\u5b572,4\u8868\u793a\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u4e2d\u7684\u884c\u3002<\/p>\n\n\n\n
2,4c2,4 \u7684\u542b\u4e49\u662f\uff1a\u7b2c\u4e00\u4e2a\u6587\u4ef6\u4e2d\u7684\u7b2c[2,4]\u884c(\u6ce8\u610f\u8fd9\u662f\u4e00\u4e2a\u95ed\u5408\u533a\u95f4\uff0c\u5305\u62ec\u7b2c2\u884c\u548c\u7b2c4\u884c)\u9700\u8981\u505a\u51fa\u4fee\u6539\u624d\u80fd\u4e0e\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u4e2d\u7684[2,4]\u884c\u76f8\u5339\u914d\u3002
\u63a5\u4e0b\u6765\u7684\u5185\u5bb9\u5219\u544a\u8bc9\u6211\u4eec\u9700\u8981\u4fee\u6539\u7684\u5730\u65b9\uff0c\u524d\u9762\u5e26 < \u7684\u90e8\u5206\u8868\u793a\u5de6\u8fb9\u6587\u4ef6\u7684\u7b2c[2,4]\u884c\u7684\u5185\u5bb9\uff0c\u800c\u5e26> \u7684\u90e8\u5206\u8868\u793a\u53f3\u8fb9\u6587\u4ef6\u7684\u7b2c[2,4]\u884c\u7684\u5185\u5bb9\uff0c\u4e2d\u95f4\u7684 --- \u5219\u662f\u4e24\u4e2a\u6587\u4ef6\u5185\u5bb9\u7684\u5206\u9694\u7b26\u53f7\u3002<\/p>\n\n\n\n
3.Normal\u6a21\u5f0f<\/h3>\n\n\n\n
\u4e0a\u9762\u7684\u90e8\u5206\u6211\u4eec\u8bf4\u660e\u4e86\u5982\u4f55\u67e5\u770bdiff\u547d\u4ee4\u7684\u7ed3\u679c\uff0c\u5b9e\u9645\u4e0a\u5bf9\u4e8e\u4e0a\u9762\u7684\u6bd4\u8f83\uff0c\u6211\u4eec\u4f7f\u7528\u7684\u662fdiff\u547d\u4ee4\u7684Normal\u6a21\u5f0f\uff0c\u8fd9\u4e5f\u662fdiff\u547d\u4ee4\u7684\u9ed8\u8ba4\u6a21\u5f0f\uff0c\u4e5f\u5c31\u662f\u8bf4diff\u4e24\u4e2a\u6587\u4ef6\u7684\u65f6\u5019\u5982\u679c\u4e0d\u52a0\u6a21\u5f0f\u53c2\u6570\u5219\u662f\u9ed8\u8ba4\u6a21\u5f0f\u8fdb\u884c\u6bd4\u8f83\uff0c\u5176\u6548\u679c\u4e0e(--normal)\u4e00\u6837\uff0c\u6211\u4eec\u4e3e\u4e00\u4e9b\u4f8b\u5b50\u6765\u8bf4\u660eNormal\u6a21\u5f0f\u4e0b\u7684\u8f93\u51fa\u7ed3\u679c(\u524d\u9762\u5df2\u7ecf\u8bf4\u660e\u4e86\u4e00\u79cd\u6bd4\u8f83\u7ed3\u679c)\uff0c\u4e3a\u4e86\u76f4\u89c2\u67e5\u770b\u4e24\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u6211\u5728windows\u4e0b\u9762\u901a\u8fc7BeyondCompare\u5de5\u5177\u5217\u51fa\u4e24\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\uff0c\u800c\u622a\u56fe\u4e0b\u9762\u7684\u9ed1\u8272\u90e8\u5206\u5219\u662fdiff\u7684\u6bd4\u8f83\u8f93\u51fa\u622a\u56fe\u3002<\/p>\n\n\n\n
\u7b2c\u4e00\u4e2a\u6587\u4ef6\u6bd4\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u5c11\u4e86\u884c\u7684\u60c5\u51b5\uff1a<\/p>\n\n\n\n
\"\"\/<\/figure>\n\n\n\n
\u7b2c\u4e00\u4e2a\u6587\u4ef6\u6bd4\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u591a\u51fa\u884c\u7684\u60c5\u51b5\uff1a<\/p>\n\n\n\n
\"2\"\/<\/figure>\n\n\n\n
\u7b2c\u4e00\u4e2a\u6587\u4ef6\u4e0e\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u4e0d\u76f8\u540c\u7684\u60c5\u51b5\uff1a<\/p>\n\n\n\n
\"3\"\/<\/figure>\n\n\n\n
\u4ee5\u4e0adiff\u547d\u4ee4\u6267\u884c\u7684\u65f6\u5019\u6ca1\u6709\u6307\u5b9a\u989d\u5916\u7684\u6a21\u5f0f\u53c2\u6570\uff0c\u6240\u4ee5\u5176\u4f7f\u7528\u7684\u662f\u9ed8\u8ba4\u7684Normal\u6a21\u5f0f\uff0c\u6548\u679c\u4e0e\u6dfb\u52a0\u547d\u4ee4\u884c\u53c2\u6570--normal \u662f\u4e00\u6837\u7684\u3002<\/p>\n\n\n\n
4.Context\u6a21\u5f0f<\/h3>\n\n\n\n
\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u7684\u6a21\u5f0f\u8f93\u51fa\u7ed3\u679c\u5b9e\u9645\u4e0a\u662f\u7b26\u5408\u8ba1\u7b97\u673a\u7684\u601d\u7ef4\u65b9\u5f0f\uff0c\u4e0d\u592a\u76f4\u89c2\uff0c\u6240\u4ee5\u5176\u8f93\u51fa\u7ed3\u679c\u5e76\u4e0d\u80fd\u591f\u5f88\u597d\u7684\u88ab\u4eba\u7406\u89e3\uff0cdiff\u547d\u4ee4\u9664\u4e86\u9ed8\u8ba4\u6a21\u5f0f\u4e4b\u5916\u8fd8\u63d0\u4f9b\u4e86\u53e6\u5916\u4e24\u79cd\u6a21\u5f0f\uff0cContext\u548cUnified\u6a21\u5f0f\uff0c\u672c\u8282\u6211\u4eec\u8bf4\u8bf4\u5982\u4f55\u67e5\u9605Context\u6a21\u5f0f\u4e0b\u7684\u8f93\u51fa\u7ed3\u679c\u3002diff\u547d\u4ee4\u5e94\u7528Context\u6a21\u5f0f\u53ea\u9700\u8981\u6dfb\u52a0\u547d\u4ee4\u884c\u53c2\u6570 diff -c  \u5373\u53ef\uff0c\u6211\u4eec\u5148\u770b\u770b\u4e24\u4e2a\u6848\u4f8b\u6587\u4ef6\uff1a<\/p>\n\n\n\n
\"33\"\/<\/figure>\n\n\n\n
\u63a5\u4e0b\u6765\u8bf4\u660e\u8fd9\u4e24\u4e2a\u6587\u4ef6\u4ee5diff  -c \u65b9\u5f0f\u6bd4\u8f83\u7684\u7ed3\u679c\uff1a<\/p>\n\n\n\n
\"3\"\/<\/figure>\n\n\n\n
5.Unified\u6a21\u5f0f<\/h3>\n\n\n\n
diff\u8fd8\u6709\u4e00\u79cd\u6bd4\u8f83\u65b9\u5f0f\uff0c\u4e5f\u5373Unified\u6a21\u5f0f\uff0c\u4f7f\u7528\u547d\u4ee4\u884c \u2013u \u6765\u6267\u884c\u8be5\u6a21\u5f0f\u7684\u6bd4\u8f83\u3002\u5176\u6bd4\u8f83\u7ed3\u679c\u4e0eContext\u6a21\u5f0f\u5f88\u50cf\uff0c\u4f46\u662f\u7b80\u5316\u4e86\u4e00\u4e9b\u8f93\u51fa\uff0c\u6211\u4eec\u770b\u770b\u6211\u4eec\u7684\u6848\u4f8b\u6587\u4ef6\uff0c\u4e0e\u4e0a\u9762\u7684\u4e00\u6837\uff1a<\/p>\n\n\n\n
\"3\"\/<\/figure>\n\n\n\n
\u4f7f\u7528diff \u2013u \u6bd4\u8f83\u7684\u7ed3\u679c\uff1a<\/p>\n\n\n\n
\"3\"\/<\/figure>\n\n\n\n
\u53ef\u4ee5\u770b\u5230\u5176\u6bd4\u8f83\u7ed3\u679c\u4e0eContext\u6a21\u5f0f\u5b9e\u9645\u4e0a\u5dee\u4e0d\u591a\uff0c\u53ea\u4e0d\u8fc7\u5c06\u6bd4\u8f83\u7ed3\u679c\u5408\u5e76\u5230\u4e00\u8d77\u4e86\u3002<\/p>\n\n\n\n
6.\u6bd4\u8f83\u76ee\u5f55<\/h3>\n\n\n\n
\u4f7f\u7528diff\u53ef\u4ee5\u6bd4\u8f83\u4e24\u4e2a\u76ee\u5f55\uff0c\u5176\u6bd4\u8f83\u683c\u5f0f\u662f  diff  directory1  directory2 \u67e5\u770b\u5982\u4e0b\u76ee\u5f55\u6bd4\u8f83\u7ed3\u679c\uff1a<\/p>\n\n\n\n
\"3\"\/<\/figure>\n\n\n\n
\u6bd4\u8f83\u4e24\u4e2a\u76ee\u5f55\u7684\u65f6\u5019\u65e0\u975e\u662f\u6709\u7684\u6587\u4ef6\u4ec5\u4ec5\u5b58\u5728\u4e8e\u67d0\u4e2a\u76ee\u5f55\u4e2d\u800c\u5728\u53e6\u4e00\u4e2a\u76ee\u5f55\u4e2d\u6ca1\u6709\uff0c\u5982\u679c\u5b58\u5728\u540c\u540d\u7684\u6587\u4ef6\uff0c\u5219\u6bd4\u8f83\u8fd9\u4e24\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u3002diff\u6bd4\u8f83\u76ee\u5f55\u7684\u7ed3\u679c\u6211\u4eec\u53ef\u4ee5\u7ed3\u5408grep\u547d\u4ee4\u7b5b\u9009\u51fa\u6211\u4eec\u60f3\u8981\u7684\u8f93\u51fa\uff0c\u4f8b\u5982\u4ec5\u4ec5\u8f93\u51fa\u4e24\u4e2a\u76ee\u5f55\u4e0b\u4e0d\u540c\u7684\u6587\u4ef6\u800c\u5ffd\u7565\u6389\u67d0\u4e00\u4e2a\u76ee\u5f55\u72ec\u6709\u53e6\u4e00\u4e2a\u76ee\u5f55\u4e0d\u5b58\u5728\u7684\u8f93\u51fa\u8bb0\u5f55\u3002<\/p>\n\n\n\n
7.\u53c2\u6570 -e \u5c06\u6bd4\u8f83\u7684\u7ed3\u679c\u4fdd\u5b58\u6210\u4e00\u4e2aed\u811a\u672c\uff0c\u4e4b\u540eed\u7a0b\u5e8f\u53ef\u4ee5\u6267\u884c\u8be5\u811a\u672c\u6587\u4ef6\uff0c\u4ece\u800c\u5c06file1\u4fee\u6539\u6210\u4e0efile2\u7684\u5185\u5bb9\u76f8\u540c\uff0c\u8fd9\u4e00\u822c\u5728patch\u7684\u65f6\u5019\u6709\u7528\u3002<\/strong><\/p>\n\n\n\n
diff  -e  1.txt  2.txt  > script.txt
\u8fd9\u6837\u5c31\u662f\u751f\u6210\u4e86\u4e00\u4e2aed\u53ef\u4ee5\u6267\u884c\u7684\u811a\u672c\u6587\u4ef6script.txt\uff0c\u751f\u6210\u811a\u672c\u6587\u4ef6\u4e4b\u540e\u6211\u4eec\u8fd8\u9700\u8981\u505a\u4e00\u4e2a\u64cd\u4f5c\uff0c \u5728\u811a\u672c\u6587\u4ef6\u672b\u5c3e\u6dfb\u52a0ed\u7684write\u6307\u4ee4\uff0c\u53ea\u9700\u8981\u6267\u884c echo \"w\" >>script.txt \u5c06w\u6307\u4ee4\u9644\u52a0\u5230\u811a\u672c\u6587\u4ef6\u7684\u6700\u540e\u4e00\u884c\u5373\u53ef\u3002
\u90a3\u4e48\u5982\u4f55\u5e94\u7528\u8be5\u811a\u672c\u6587\u4ef6\u5462\uff0c\u53ef\u4ee5\u8fd9\u6837\u4f7f\u7528\uff1a
ed  -  1.txt < script.txt 
\u6ce8\u610f\u4e2d\u95f4\u7684 \u2013 \u7b26\u53f7\u8868\u793a\u4ece\u6807\u51c6\u8f93\u5165\u4e2d\u8bfb\u53d6\uff0c\u800c < script.txt \u5219\u91cd\u5b9a\u5411script.txt\u7684\u5185\u5bb9\u5230\u6807\u51c6\u8f93\u5165\u3002\u8fd9\u6837\u6267\u884c\u4e4b\u540e1.txt\u7684\u5185\u5bb9\u5c06\u4e0e2.txt\u5b8c\u5168\u76f8\u540c\u3002<\/p>\n\n\n\n
\u6458\u81ea\uff1ahttp:\/\/man.linuxde.net\/diff<\/a><\/p>
https:\/\/www.cnblogs.com\/everest33Tong\/p\/6868654.html<\/a><\/p><\/blockquote>\n","protected":false},"excerpt":{"rendered":"
1.\u6982\u8ff0   windows\u7cfb\u7edf\u4e0b\u9762\u5c31\u6709\u4e0d\u9519\u7684\u6587\u672c\u5bf9\u6bd4\u5de5\u5177\u53ef\u4ee5\u4f7f\u7528\uff0c\u4f8b\u5982\u5e38\u7528\u7684Beyond Comp<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[17],"tags":[],"yoast_head":"\ndiff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"diff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\" \/>\n<meta property=\"og:description\" content=\"1.\u6982\u8ff0   windows\u7cfb\u7edf\u4e0b\u9762\u5c31\u6709\u4e0d\u9519\u7684\u6587\u672c\u5bf9\u6bd4\u5de5\u5177\u53ef\u4ee5\u4f7f\u7528\uff0c\u4f8b\u5982\u5e38\u7528\u7684Beyond Comp\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\" \/>\n<meta property=\"og:site_name\" content=\"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\" \/>\n<meta property=\"article:published_time\" content=\"2019-10-23T07:11:59+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2019-10-23T07:22:59+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/images.cnblogs.com\/cnblogs_com\/wangqiguo\/870695\/o_2.a.png\" \/>\n<meta name=\"author\" content=\"\u7ba1\u7406\u5458\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\"},\"author\":{\"name\":\"\u7ba1\u7406\u5458\",\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1\"},\"headline\":\"diff \u547d\u4ee4\u8be6\u89e3\",\"datePublished\":\"2019-10-23T07:11:59+00:00\",\"dateModified\":\"2019-10-23T07:22:59+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\"},\"wordCount\":245,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1\"},\"articleSection\":[\"Linux\"],\"inLanguage\":\"zh-CN\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\",\"url\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\",\"name\":\"diff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\",\"isPartOf\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/#website\"},\"datePublished\":\"2019-10-23T07:11:59+00:00\",\"dateModified\":\"2019-10-23T07:22:59+00:00\",\"breadcrumb\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#breadcrumb\"},\"inLanguage\":\"zh-CN\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.linuxdevops.cn\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Linux\",\"item\":\"https:\/\/www.linuxdevops.cn\/linux\/\"},{\"@type\":\"ListItem\",\"position\":3,\"name\":\"diff \u547d\u4ee4\u8be6\u89e3\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.linuxdevops.cn\/#website\",\"url\":\"https:\/\/www.linuxdevops.cn\/\",\"name\":\"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\",\"description\":\"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\u7b14\u8bb0\",\"publisher\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1\"},\"alternateName\":\"linuxdevops\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/www.linuxdevops.cn\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"zh-CN\"},{\"@type\":[\"Person\",\"Organization\"],\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1\",\"name\":\"\u7ba1\u7406\u5458\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-CN\",\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/www.linuxdevops.cn\/wp-content\/uploads\/2019\/07\/cropped-index.jpg\",\"contentUrl\":\"https:\/\/www.linuxdevops.cn\/wp-content\/uploads\/2019\/07\/cropped-index.jpg\",\"width\":512,\"height\":512,\"caption\":\"\u7ba1\u7406\u5458\"},\"logo\":{\"@id\":\"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/image\/\"},\"description\":\"\u7ba1\u7406\u5458\",\"url\":\"https:\/\/www.linuxdevops.cn\/author\/root\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"diff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/","og_locale":"zh_CN","og_type":"article","og_title":"diff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4","og_description":"1.\u6982\u8ff0   windows\u7cfb\u7edf\u4e0b\u9762\u5c31\u6709\u4e0d\u9519\u7684\u6587\u672c\u5bf9\u6bd4\u5de5\u5177\u53ef\u4ee5\u4f7f\u7528\uff0c\u4f8b\u5982\u5e38\u7528\u7684Beyond Comp","og_url":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/","og_site_name":"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4","article_published_time":"2019-10-23T07:11:59+00:00","article_modified_time":"2019-10-23T07:22:59+00:00","og_image":[{"url":"https:\/\/images.cnblogs.com\/cnblogs_com\/wangqiguo\/870695\/o_2.a.png"}],"author":"\u7ba1\u7406\u5458","twitter_card":"summary_large_image","schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#article","isPartOf":{"@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/"},"author":{"name":"\u7ba1\u7406\u5458","@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1"},"headline":"diff \u547d\u4ee4\u8be6\u89e3","datePublished":"2019-10-23T07:11:59+00:00","dateModified":"2019-10-23T07:22:59+00:00","mainEntityOfPage":{"@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/"},"wordCount":245,"commentCount":0,"publisher":{"@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1"},"articleSection":["Linux"],"inLanguage":"zh-CN","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/","url":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/","name":"diff \u547d\u4ee4\u8be6\u89e3 - Linux\u81ea\u52a8\u5316\u8fd0\u7ef4","isPartOf":{"@id":"https:\/\/www.linuxdevops.cn\/#website"},"datePublished":"2019-10-23T07:11:59+00:00","dateModified":"2019-10-23T07:22:59+00:00","breadcrumb":{"@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#breadcrumb"},"inLanguage":"zh-CN","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.linuxdevops.cn\/2019\/10\/diff-command-details\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.linuxdevops.cn\/"},{"@type":"ListItem","position":2,"name":"Linux","item":"https:\/\/www.linuxdevops.cn\/linux\/"},{"@type":"ListItem","position":3,"name":"diff \u547d\u4ee4\u8be6\u89e3"}]},{"@type":"WebSite","@id":"https:\/\/www.linuxdevops.cn\/#website","url":"https:\/\/www.linuxdevops.cn\/","name":"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4","description":"Linux\u81ea\u52a8\u5316\u8fd0\u7ef4\u7b14\u8bb0","publisher":{"@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1"},"alternateName":"linuxdevops","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/www.linuxdevops.cn\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"zh-CN"},{"@type":["Person","Organization"],"@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/3e206335d5796fdd8679e449df72a0d1","name":"\u7ba1\u7406\u5458","image":{"@type":"ImageObject","inLanguage":"zh-CN","@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/image\/","url":"https:\/\/www.linuxdevops.cn\/wp-content\/uploads\/2019\/07\/cropped-index.jpg","contentUrl":"https:\/\/www.linuxdevops.cn\/wp-content\/uploads\/2019\/07\/cropped-index.jpg","width":512,"height":512,"caption":"\u7ba1\u7406\u5458"},"logo":{"@id":"https:\/\/www.linuxdevops.cn\/#\/schema\/person\/image\/"},"description":"\u7ba1\u7406\u5458","url":"https:\/\/www.linuxdevops.cn\/author\/root\/"}]}},"_links":{"self":[{"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/posts\/613"}],"collection":[{"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/comments?post=613"}],"version-history":[{"count":2,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/posts\/613\/revisions"}],"predecessor-version":[{"id":620,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/posts\/613\/revisions\/620"}],"wp:attachment":[{"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/media?parent=613"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/categories?post=613"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.linuxdevops.cn\/wp-json\/wp\/v2\/tags?post=613"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}