Make using alternative merge tool work by pressing the shift key