Questions tagged [diff3]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
1
vote
0answers
37 views

How to use diff3 with text arguments instead of file paths?

I want to use diff3 with text arguments instead of file paths. For example, diff3 some_files/mine.txt some_files/older.txt ~/Downloads/yours.txt works as expected. However, I've been trying to achieve ...
2
votes
1answer
61 views

How shall I understand the different outputs by `-A` and by `-e` of diff3?

diffutils' manual says, in diff3 -A mine older yours The ‘--show-all’ (‘-A’) option acts like the ‘-e’ option, except that it brackets conflicts, and it outputs all changes from older to yours, not ...
0
votes
2answers
72 views

How shall I understand the conditions for merging by diff3 to be well-defined?

In diffutils' manual diff3 mine older yours You can remember the order of the arguments by noting that they are in alphabetical order. You can think of this as subtracting older from yours and ...