ashley/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2024-10-28 23:17:58 +01:00
Code Activity

diff3: add page (#2437)

Browse source
This commit is contained in:
Flavia Bastos 2018-10-18 10:47:31 -03:00 committed by Owen Voke
parent f49d0f7965
commit 51fa65a9a1
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pages/linux/diff3.md Normal file
View 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}}`