[Resend PATCH] pwclient: support 3-way merge
stephen at that.guru
Tue Dec 20 01:33:43 AEDT 2016
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?
None, other that I can't apply it, heh. See mail from last night.
Can you resend one final time?
More information about the Patchwork