Added an option to specify a threeway merge command