diff of IDEA is very cool

Evans Zhang wrote:

I develop one game for over 20 mobile. I had to setup a project for each mobile. The source is almost the same but different somewhere. When I fix a bug, it should apply to others projects. So I use the diff function of IDEA. It is very cool!

True, it is, but the merge tool leaves a lot to be desired.

The #1 missing feature from the merge tool IMO is the ability to state
"use local change before repository" and vise versa.

Amnon