On Thu, 17 Sep 2009, Christian Couder wrote:

> On Thu, Sep 17, 2009 at 7:15 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> > I'd like to see at least the following rows filled as well.
> >
> >    X      U     A     A   --m-s      ???    ???   ???
> >                           --merge    ???    ???   ???
> >    X      U     B     A   --m-s      ???    ???   ???
> >                           --merge    ???    ???   ???
> >
> >> In this table, A, B and C are some different states of a file.
> >
> > ... and X is "don't care", and U is "unmerged index".
> 
> I will have a look, but it seems to me that --m-s and --merge
> behave the same in these cases.

It's still worth documenting, since it used to be entirely undocumented 
(and probably not what it should have been), and also because you're 
making it something reliable for the first time in this series.

	-Daniel
*This .sig left intentionally blank*