MergeFile merges changes that lead from opt.Base to opt.Other into opt.Current, flagging conflictsas appropriate. This will return an io.Reader of the merged state rather than directly Current. BUG(driusan): this currently invokes an external diff3 tool, which needs to be installed in order to wor
(c *Client, opt MergeFileOptions)