Add mergetool option to merge script

Change-Id: I79ded5e4a437e84d444f98e20c70bef023f66398
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>