Hi Kuba,
On Tue, 26 Jul 2016, Jakub Narębski wrote:
> W dniu 2016-07-25 o 21:25, Jeff Hostetler pisze:
>
> > + Field Meaning
> > + --------------------------------------------------------
> > + <xy> A 2 character field describing the conflict type
> > + as described in the short format.
> > + <sub> A 4 character field describing the submodule state
> > + as described above.
> > + <m*> The 6 character octal file modes for the stage 1,
> > + stage 2, stage 3, and worktree.
>
> Errr... the pattern has only _3_ character octal modes, <m1> <m2> <m3>.
> A question: what happens during octopus merge?
From git-merge-octopus.sh:
# We allow only last one to have a hand-resolvable
# conflicts. Last round failed and we still had
# a head to merge.
In other words, octopus merges do not use higher stages than 3.
Ciao,
Dscho
