DiffMerge supports three way merges.
Something went wrong. Please try again.
DiffMerge is cross platform and is available for all major operating systems. This means WIndows, Linux and OSX.
It's not possible edit the source ( left ) and target ( right ) file in the same time, only one way ( left to side ) is possible on file compare diff screen.
Built By the Slant team
Are you sure that you want to abandon your hard work?