srivasta/ucf — pull request #1 by fberlakovich (2014-08-06 07:58:12+00:00)
Title: Added an option to specify a threeway merge command

Markus already talked to you about a possible Elektra merge integration. This pull request adds a generic hook for specifying a threeway-merge command to use. This would make it possible to specify the Elektra merge command instead of diff3. I am not a bash expert, however. So if you like the idea, but not the code I would be glad to help implementing it in a different way.