[PATCH v2] pwclient: support 3-way merge

[Stephen Finucane]

On Tue, 2016-12-20 at 11:49 +0100, 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>

LGTM.

Reviewed-by: Stephen Finucane <stephen at that.guru>

...and applied.