Questions tagged [diff3]
The diff3 tag has no summary.
4 questions
3
votes
1
answer
128
views
Why diff3 on inputs from process substitution finds a difference while diff3 on same data in files finds no difference?
diff3 on files finds no difference:
$ grep -P '\[\[.*?\]\]' -o intro.tex | sort > A.txt
$ grep -P '\[\[.*?\]\]' -o intro.tex | sort | uniq > B.txt
$ grep '\\pnum %% \[\[' intro.tex | sed 's/\\...
- 757
1
vote
0
answers
99
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 ...
- 111
2
votes
1
answer
155
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 ...
- 107k
0
votes
2
answers
198
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 ...
- 107k