Update diff.md (#379)

This commit is contained in:
Zhang Zijing 2022-06-22 21:55:17 +08:00 committed by GitHub
parent db4c9abe4b
commit 1f5daf938d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 0 deletions

View File

@ -59,6 +59,62 @@ diff(选项)(参数)
### 实例
#### 以正常模式比较差异
```shell
diff a.txt b.txt
```
#### 以上下文 (context) 模式比较差异
```shell
diff -c a.txt b.txt
```
```
  *** a1.txt 2012-08-29 16:45:41.000000000 +0800
  --- a2.txt 2012-08-29 16:45:51.000000000 +0800
  ***************
  *** 1,7 ****
   a
   a
   a
  !a
   a
   a
   a
  --- 1,7 ----
   a
   a
   a
  !b
   a
   a
   a
```
#### 以联合 (unified) 模式比较差异
```shell
diff -u a.txt b.txt
```
```
  --- a.txt 2012-08-29 16:45:41.000000000 +0800
  +++ b.txt 2012-08-29 16:45:51.000000000 +0800
  @@ -1,7 +1,7 @@
   a
   a
   a
  -a
  +b
   a
   a
   a
```
#### 多文件比较差异
将目录`/usr/li`下的文件"test.txt"与当前目录下的文件"test.txt"进行比较,输入如下命令:
```shell