mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-02-07 23:45:52 +00:00
Update cheatsheets
This commit is contained in:
@@ -14,4 +14,4 @@ source: https://github.com/tldr-pages/tldr.git
|
||||
|
||||
- Show all changes, outlining conflicts:
|
||||
|
||||
`diff3 --show-all {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
|
||||
`diff3 {{[-A|--show-all]}} {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
|
||||
|
||||
Reference in New Issue
Block a user