From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 25 Jun 2019 01:11:40 GMT
Subject: Re: [PATCH 14/14] completion: add default merge strategies
Message-ID: <CAMP44s0y_3Ltv_hnoVByTRwZrDU0+PfRo3R=Lxm6wDk+=sypJg@mail.gmail.com>
In-Reply-To: <xmqq5zouj3rl.fsf@gitster-ct.c.googlers.com>

On Mon, Jun 24, 2019 at 12:24 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
> > In case the command fails.
>
> It is unclear what you wanted to say with this.  What command?
> After "git merge" fails?

Yes. The command that __git_list_merge_strategies() uses.

 % cd /tmp
 % git merge -s help
fatal: not a git repository (or any parent up to mount point /)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

-- 
Felipe Contreras