ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-02-07 22:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pages under tldr, lint run.sh, update docs

Browse Source
This commit is contained in:
Ismo Vuorinen
2024-02-21 13:58:43 +02:00
parent 3d653cc7e6
commit 2c475fa62d
4806 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tldr/linux/diff3 Normal file
View File

@@ -0,0 +1,17 @@
---
syntax: markdown
tags: [tldr, linux]
source: https://github.com/tldr-pages/tldr.git
---
# diff3
> Compare three files line by line.
> More information: <https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html>.
- Compare files:
`diff3 {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
- Show all changes, outlining conflicts:
`diff3 --show-all {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`