|
|
|
|
|
|
by alimbada
717 days ago
|
|
|
I tried Meld for 3-way merges and while it seemed ok I prefer P4Merge. It's free, but not open source. If I'm using Jetbrains tools though, I'll always use the built in merge tool as it's the most intuitive to use in my experience. |
|
|