Subject: Re: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

From: Eli Zaretskii <[email-masked]>
Date: Sat, 16 May 2015 10:15:19 +0300

> Cc: Eli Zaretskii <[email-masked]>, [email-masked], [email-masked]
> From: Dmitry Gutov <[email-masked]>
> Date: Sat, 16 May 2015 02:50:57 +0300
> 
> On 05/14/2015 11:55 PM, Stefan Monnier wrote:
> >
> > I think the only sane way to handle this is to always use "git add" and
> > to add a config var so users who don't like it can disable it.
> 
> If we're fine with a config var, we might as well try to support the 
> alternative behavior. This should do it:

Thanks.  Just so I'm sure my reading of the patch is correct: this
option will never modify the behavior for conflicts that arise during
a "normal" merge (as opposed to "stash pop", for example), right?