Added an option to specify a threeway merge command and included an Elektra sample script