diff-tool | create images of the squared difference | Computer Vision library

The first time you assign to a variable (in this case delta), if you don't provide a type annotation, a type is inferred based on the assigned value. Subsequent assignments will produce errors if you assign an incompatible type.

So the first assignment doesn't error because it doesn't conflict with anything; the second assignment errors because it conflicts with the first assignment.

Since this value isn't used outside these blocks, I'd recommend just using two different variable names since you have two different types of values. I.e.:

I cannot reproduce your experience. Here is my attempt:

Make sure you have something to the effect of the following in you .gitconfig and get rid of the alias:

Create file p4mergebash.sh and set $PATH:

To re-enable the pre-2019 diff scrollbar, turn on "Show the difference overview margin" under Tools / Options / Text Editor / Advanced.

Thanks to David Pugh at Microsoft for providing this answer on the Developer Community.

Maybe not exactly, but you can get the exact same effect. (Maybe that is "exactly". :-) ) Instead of changing the persistent local configuration with git config diff.tool sometool, just change the configuration used for this Git command with, e.g., git -c diff.tool=sometool difftool ....

Any change you could make permanently with git config name value, you can make temporarily with git -c name=value, for the duration of one Git command.

Edit: note that git difftool itself has a -t tool argument, so this particular example is a bit silly. I'm just using it here to show how the -c name=value trick works.

n.b. I'm assuming you are getting proper ansi escape codes, and the escape characters were just lost in the process of posting the question.

Here's a solution derived from the alter-text-property code.