diff3: add page (#2437)
This commit is contained in:
11
pages/linux/diff3.md
Normal file
11
pages/linux/diff3.md
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
# diff3
|
||||||
|
|
||||||
|
> Compare three files line by line.
|
||||||
|
|
||||||
|
- Compare files:
|
||||||
|
|
||||||
|
`diff3 {{file1}} {{file2}} {{file3}}`
|
||||||
|
|
||||||
|
- Show all changes, outlining conflicts:
|
||||||
|
|
||||||
|
`diff3 --show-all {{file1}} {{file2}} {{file3}}`
|
Reference in New Issue
Block a user