|
|
|
|
|
|
by steerablesafe
1606 days ago
|
|
|
It's semantically slightly different. In the case of diff3 if you remove everything but the base part, then you get exactly the base version, while in the case of zdiff3 you also get the prefix and suffix parts from the two branches that merge cleanly. I guess the difference is subtle, especially that there can be other merges within the same file that merge cleanly in both cases. |
|
|