Update cheatsheets

This commit is contained in:
ivuorinen
2024-02-21 11:19:49 +00:00
parent 4e88a1b42f
commit 3d653cc7e6
4803 changed files with 127002 additions and 0 deletions

17
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}}`