2018-10-18 14:47:31 +01:00
|
|
|
# diff3
|
|
|
|
|
|
|
|
|
|
> Compare three files line by line.
|
2021-07-09 15:45:55 +01:00
|
|
|
> More information: <https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html>.
|
2018-10-18 14:47:31 +01:00
|
|
|
|
|
|
|
|
- Compare files:
|
|
|
|
|
|
2023-05-24 04:30:31 +01:00
|
|
|
`diff3 {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
|
2018-10-18 14:47:31 +01:00
|
|
|
|
|
|
|
|
- Show all changes, outlining conflicts:
|
|
|
|
|
|
2023-05-24 04:30:31 +01:00
|
|
|
`diff3 --show-all {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
|
