2019-03-27 17:40:27 +00:00
|
|
|
# diff3
|
|
|
|
|
|
|
|
|
|
> Compara 3 arquivos linha por linha.
|
2021-07-09 15:45:55 +01:00
|
|
|
> Mais informações: <https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html>.
|
2019-03-27 17:40:27 +00:00
|
|
|
|
2019-03-28 17:48:42 +00:00
|
|
|
- Comparar os arquivos:
|
2019-03-27 17:40:27 +00:00
|
|
|
|
2019-03-28 17:48:42 +00:00
|
|
|
`diff3 {{arquivo1}} {{arquivo2}} {{arquivo3}}`
|
2019-03-27 17:40:27 +00:00
|
|
|
|
2019-03-28 17:48:42 +00:00
|
|
|
- Exibir todas as diferenças, destacando os conflitos:
|
2019-03-27 17:40:27 +00:00
|
|
|
|
2019-03-28 17:48:42 +00:00
|
|
|
`diff3 --show-all {{arquivo1}} {{arquivo2}} {{arquivo3}}`
|
