diff 命令 expain

来源:互联网 发布:资料恢复软件 编辑:程序博客网 时间:2024/06/05 16:20
-> diff initial.txt changed.txt 1c1,3<   type[37] inventory infomation initial begin ---------->  > > type[37] inventory infomation changed begin -------15,18c17,18< 0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0xe6,0xd3,<  type[37] inventory infomation initial end-------< < initial one more line---> 0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0xe6,0x6f,>  type[37] inventory infomation changed end-------

1c1,3  第一行是一个提示,用来说明变动位置。

它分成三个部分:前面的”1″,表示initial.txt的第1行有变化;中间的”c”表示变动的模式是内容改变(change),其他模式还有”增加”(a,代表addition)和”删除”(d,代表deletion);后面的”1,3″,表示变动后变成changed.txt的第1-3行。

第二行分成两个部分。

    <   type[37] inventory infomation initial begin -------

前面的小于号,表示要从initial.txt当中去除该行(也就是第1行),后面表示该行的内容。 第三行用来分割initial.txt和changed.txt

第4-6行,类似于第二行。

    >      >     > type[37] inventory infomation changed begin -------

前面的大于号表示changed.txt 增加了该行,后面表示该行的内容。

-> more initial.txt   type[37] inventory infomation initial begin -------0x33,0x30,0x46,0x4e,0x54,0x53,0x53,0x46,0x44,0x38,0x42,0x20,0x20,0x20,0x57,0x4f,0x46,0x46,0x41,0x44,0x42,0x42,0x41,0x41,0x33,0x4b,0x43,0x31,0x39,0x33,0x34,0x39,0x41,0x42,0x41,0x41,0x30,0x31,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x52,0x54,0x20,0x20,0x52,0x54,0x31,0x34,0x32,0x30,0x30,0x30,0x31,0x33,0x33,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x30,0x30,0x31,0x34,0x30,0x35,0x31,0x33,0x2d,0x2d,0x2d,0x2d,0x2d,0x45,0x54,0x52,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0xe6,0xd3, type[37] inventory infomation initial end-------initial one more line-> more changed.txt  type[37] inventory infomation changed begin -------0x33,0x30,0x46,0x4e,0x54,0x53,0x53,0x46,0x44,0x38,0x42,0x20,0x20,0x20,0x57,0x4f,0x46,0x46,0x41,0x44,0x42,0x42,0x41,0x41,0x33,0x4b,0x43,0x31,0x39,0x33,0x34,0x39,0x41,0x42,0x41,0x41,0x30,0x31,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x52,0x54,0x20,0x20,0x52,0x54,0x31,0x34,0x32,0x30,0x30,0x30,0x31,0x33,0x33,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x30,0x30,0x31,0x34,0x30,0x35,0x31,0x33,0x2d,0x2d,0x2d,0x2d,0x2d,0x45,0x54,0x52,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0xe6,0x6f, type[37] inventory infomation changed end-------





0 0
原创粉丝点击