[Resend PATCH] pwclient: support 3-way merge

[Stephen Finucane]

On Mon, 2016-12-19 at 14:33 +0000, Stephen Finucane wrote:
> On Mon, 2016-12-19 at 12:12 +0100, Matthias Brugger wrote:
> > 
> > On 18/11/16 10:44, Matthias Brugger wrote:
> > > Add support for the 3-way merge in git-am.
> > > This can be done via
> > >   - the commandline
> > >   - the global option section
> > >   - the per-project section
> > > 
> > > Signed-off-by: Matthias Brugger <mbrugger at suse.com>
> > 
> > Stephen, any comments/objection on this patch?
> > 
> > Regards,
> > Matthias
> 
> None, other that I can't apply it, heh. See mail from last night.
> 
>   https://lists.ozlabs.org/pipermail/patchwork/2016-December/003876.h
> tm
> l
> 
> Can you resend one final time?

Actually I do have one comment after inspecting it further. I don't
know if we should be wrapping the arguments of git-am. I think a combo
of 'parse_known_args' (instead of 'parse_args') and the '--' marker
could be used to allow us to pass all arguments through to git-am,
allowing for any option (which seems like a good thing):

    $ pwclient git-am 123 -- --3way --utf8 -i

*However*, I'm also happy with this as is so I'll leave the decision to
you.

Stephen