Stack Overflow
Stack Overflow

Questions tagged [difftool]

107 questions
2
votes
4 answers

how to make git difftool to always export absolute paths

When using 'git difftool' it passes relative path to external diff application when one of the files is the latest version. ~/.gitconfig [difftool "echo"] cmd = echo $LOCAL $REMOTE path = [diff] tool = echo example command git difftool…
Anton K
  • 557
  • 5
  • 9
2
votes
1 answer

Difftool for binary files in Git

I have made Git to diff some binary files by copying the files to a directory in the Temp folder in Windows using a .bat file (or batch script). The script copies the original file and makes a companion file with extension .txt which contains the…
Roger
  • 2,912
  • 2
  • 31
  • 39
2
votes
1 answer

after doing a git difftool --dir-diff, files are modified for some reason

After doing git difftool --dir-diff, my workspace files are modified for some reason. I've been guessing that it's converting the line endings between crlf and lf etc... However, doing "git config core.autocrlf false" or "git config --global…
user1715925
  • 607
  • 9
  • 26
2
votes
2 answers

Unable to understand how Git's difftool configs are set

I needed to use in my old Git similar settings to the following to be able use difftool. The settings are not exactly the same, since I by accident removed my old .gitconfig. [merge] tool=opendiff [mergetool] tool=opendiff [difftool] …
Léo Léopold Hertz 준영
  • 134,464
  • 179
  • 445
  • 697
1
vote
1 answer

Error setting vscode as difftool and mergetool in windows

I am getting the below error when I try to use merge tool in git. git config option merge.tool set to unknown tool: code Resetting to default... This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or…
DingRealT
  • 57
  • 6
1
vote
1 answer

Is there a way to stop `git diff-tool` when return code is non-zero from the diff-tool is non-zero

I am aware of the git config option difftool.prompt true However, I am wondering if there is a way to stop diffing when return code is non-zero. I am using vim as diff-tool and if I exit using :cq it will return non-zero but the default settings of…
I J
  • 47
  • 6
1
vote
1 answer

How to make "git difftool --dir-diff" working with vim

I am happy working with git difftool --dir-diff with beyond compare to show overall diff across directories and files and navigate through them. However when it comes to vimdiff, seems it do not support dir diff from git. A git alias I created is as…
Eric Sun
  • 777
  • 6
  • 20
1
vote
1 answer

Running Idea Mergetool

I have inside my .gitconfig [merge] tool = intellij [mergetool "intellij"] cmd = /usr/local/bin/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE")…
Saravanabalagi Ramachandran
  • 8,551
  • 11
  • 53
  • 102
1
vote
2 answers

How can I correctly set vscode as the difftool for perforce (p4)

Currently I have the following: My issue though is that when I try to do a compare, Visual Studio Code just opens both revisions in two separate tabs, not in a diff view. Is there a way I can set this up so that when the revisions are opened…
MrDuk
  • 16,578
  • 18
  • 74
  • 133
1
vote
0 answers

Error when trying to invoke mergetool from git

Trying to invoke mergetool. Had previously set up both mergetool and difftool. Followed same process for both. Difftool works, but mergetool does not. When I try to invoke mergetool, I get: SAR@DESKTOP-7MC10MV MINGW64 ~/projects/starter-web…
Marie Resnik
  • 11
  • 1
1
vote
1 answer

Using the Built in Visual Studio Diff Tool to View P4VS's Diffs

Visual Studio has a fantastic internal diff tool: https://www.visualstudio.com/en-us/docs/tfvc/compare-files I'm using Perforce in Visual Studio via the P4VS plugin. The plugin adds the "Diff" sub-menu when you right-click on a file's tab. But by…
Jonathan Mee
  • 37,899
  • 23
  • 129
  • 288
1
vote
2 answers

git difftool not working (ubuntu)

When running git difftool --tool=vimdiff the output I get is a diff, what I want is vimdiff... If I use git diff I get a diff | less I try configuring the global setting: git config --global diff.tool vimdiff the local setting, adding the…
Corentin
  • 11
  • 4
1
vote
1 answer

View differences of tags with a diff tool (like meld)

The question is simple - how is it possible to view the difference between two tags from a project, but with the power of a GUI, not only the the console? There is a lot of questions about view diff between commits, branches. Also helpful is diff…
bueltge
  • 2,294
  • 1
  • 29
  • 40
1
vote
2 answers

git difftool gives error

I would like to diff a particular file between 2 branches. I saw there is a difftool. But I tried and I'm not getting succeeded. I have a file called abc.cpp and 2 remote branches say May_Version and June_Version and my file is in the folder…
user6771624
  • 55
  • 2
  • 8
1
vote
2 answers

How to open git difftool for multiple files in a single Bcomp3 window?

When using git difftool --tool=bc3 from Git-Bash I got a BC3 window for each file. But to see the next window I had to close the previous one. I wanted to see all diffed files at the same time as tabs in a single BC3 window.
Toni Schilling
  • 107
  • 9
1 2 3 4
5
6 7 8