David Aguilar writes:
> deltawalker, diffmerge, emerge, kdiff3, kompare, and tkdiff originally
> provided behavior that matched trustExitCode=true.
>
> The default for all tools is trustExitCode=false, which conflicts with
> these tools' defaults. Allow tools to advertise their own default value
On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote:
> On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote:
> > On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
> >
> > > Ignoring a non-zero exit code from the merge tool, and assuming a
> > > successful merge in that case,
On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote:
> I have a patch that makes it so that none of the tools do the
> check_unchanged logic themselves and instead rely on the
> library code to handle it for them. This makes the
> implementation uniform across all tools, and allows tool
On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote:
> On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
>
> > Ignoring a non-zero exit code from the merge tool, and assuming a
> > successful merge in that case, seems like the wrong default behavior
> > to me.
>
> Yeah, I'm inclined
On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote:
> Ignoring a non-zero exit code from the merge tool, and assuming a
> successful merge in that case, seems like the wrong default behavior
> to me.
Yeah, I'm inclined to agree. But like I said, I'm not too familiar with
this area, so maybe
Thanks, Jeff.
Ignoring a non-zero exit code from the merge tool, and assuming a
successful merge in that case, seems like the wrong default behavior
to me.
If your merge tool quit with an error, it is more sensible to assume
that the resolution you were working on has not been successfully
conclu
On Sat, Nov 26, 2016 at 09:44:36PM -0500, Dun Peal wrote:
> I'm using vimdiff as my mergetool, and have the following lines in
> ~/.gitconfig:
>
> [merge]
> tool = vimdiff
> [mergetool "vimdiff"]
> trustExitCode = true
>
>
> My understanding from the docs is that this sets
> mergetool.v
I'm using vimdiff as my mergetool, and have the following lines in ~/.gitconfig:
[merge]
tool = vimdiff
[mergetool "vimdiff"]
trustExitCode = true
My understanding from the docs is that this sets
mergetool.vimdiff.trustExitCode to true, thereby concluding that a
merge hasn't been success
8 matches
Mail list logo
