merge all non-conflicting

[Pedro Larroy <pedro larroy lists gmail com>]

Hi Melders

I'm wondering if I'm doing something wrong when using meld, as I'm
doing a 3-way merge merging $base $local and $other.

When I say merge all non-conflicting I get changes in $local removed
because they are merged from $base, which is usually not what one
would want to do it when using 3-way merge to resolve scm conflicts.


Any ideas?

Pedro.