Stack Overflow
Stack Overflow

Questions tagged [difftool]

107 questions
1
vote
2 answers

Using a visual tool to view changes on git repository

I'm coming to an existing project in which people used git to track everything from scratch. I want to have a tool to view the differences between several commits. gitk does a good job, but talking about human readability, it's does not facilitate…
Phương Nguyễn
  • 8,747
  • 15
  • 62
  • 96
1
vote
2 answers

git difftool problem: not setting LOCAL, REMOTE variables

According to doc and various answers here git difftool will invoke the specified executable (usually a shell script) with environment variables LOCAL and REMOTE set to the file paths. But when I try, LOCAL and REMOTE are not set. I've tried the…
c-urchin
  • 4,344
  • 6
  • 28
  • 30
1
vote
1 answer

How to configure the prompt for diffmerge

Currently I have this gitconfig: [diff] tool = diffmerge [difftool "diffmerge"] cmd = diffmerge \"$LOCAL\" \"$REMOTE\" [merge] tool = diffmerge [mergetool "diffmerge"] cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if…
Sonne
  • 691
  • 1
  • 6
  • 20
1
vote
0 answers

How to use git difftool with docdiff

How can I use git difftool with docdiff? For some documents I like the format how docdiff displays the output. Docdiff, however, outputs a HTML file (if we want its nicest output). How shall I invoke git difftool to make it display the HTML diff…
winerd
  • 1,813
  • 1
  • 14
  • 12
1
vote
3 answers

Is Git's auto-detection scripted or is it within some Git executable?

This question is based on VonC's comment at the thread. Is Git's auto-detection for difftool or mergetool scripted or is it within some Git executable?
Léo Léopold Hertz 준영
  • 134,464
  • 179
  • 445
  • 697
0
votes
0 answers

Why /usr/bin/python3: symbol lookup error on git branch comparision with difftool meld in ubuntu?

I'm trying to compare two git branches using meld, in ubuntu with following command; git difftool -d branch123 it gives me this error instead of comparision in meld: /usr/bin/python3: symbol lookup error:…
Ruwan Liyanage
  • 333
  • 1
  • 13
0
votes
1 answer

Possibility to specify a custom diff tool

Is it possible to specify a custom file comparison tool? I noticed that e.g. notepad++ with the comparePlus plugin is more powerful than the integrated comparer of VSC.
Juergen
  • 3,489
  • 6
  • 35
  • 59
0
votes
1 answer

Using "git diff" during conflict resolution phase (i.e. after a conflict in a merge attempt) ignores configured editor

Using the below configuration, [diff] tool = vimdiff [difftool] [difftool "vimdiff"] cmd = "$EDITOR -d \"$LOCAL\" \"$REMOTE\"; sleep 1" and using "git diff" during a merge conflict (I specifically don't use "git merge" here), not the specified…
nickles
  • 1
  • 2
0
votes
0 answers

Start IntelliJ's "Empty Diff" via CLI

I currently use the cool feature via cli to diff two files: $> idea diff File1 File2 But another cool tool is in IntelliJ to "Open blank diff window" (via find Action). But when I run $> idea diff The IDE closed it directly. Has anybody an Idea…
Steffen S
  • 17
  • 1
  • 5
0
votes
0 answers

See solid background instead of slant/diagnal line pattern in Visual studio code

Please check the image Replace the pattern on right side with a plain background
PEDDI VARUN KUMAR
  • 11
  • 2
0
votes
1 answer

Is it possible to set rider as difftool in GitExtensions?

I couldn't find information on google whether you can assign the rider as a diff and merge tool in GitExtensions. There is no such option in GitExtensions by default On GitHub Gist, there is only one mention of setting up rider as a global…
Pasha
  • 3
  • 2
0
votes
1 answer

Autodesk Forge DiffTool extension for DWF

Based on the below article link, The Forge Viewer (7.36) makes it easy to load and view PDF and DWF files natively https://forge.autodesk.com/blog/dwf-and-pdf-support-forge-viewer I am loading the 3D DWF files using the same procedure and wonder if…
vanc
  • 11
  • 3
0
votes
0 answers

VSCode Gitlens Difftool show error with red underline but code is working well

I just install GitLens on my VSCode. When I use difftool with old version, difftool show error with red underline. But code hasn't any problem. It work well Can any help me solve this problem. My file is TypeScript UPDATE Normal file is not…
Ninh Khương Duy
  • 1
  • 1
0
votes
1 answer

Using git difftool for files comparsion in Debian Linux v. 10 (buster)

In Debian Linux v. 9 I use following command to do files comparison and this command is working OK: git difftool /file/a /file/b In Debian Linux v. 10 I use this command in the same way and have following error: fatal: not a git repository (or any…
mshta
  • 3
  • 2
0
votes
1 answer

using vscode as git version (2.31.1) difftool

I installed git version 2.31.1.windows.1 and followed all the necessary steps shown in all git step by step trying to use VSCode as my main difftool, I put these lines in gitconfig files: [diff] tool = vscode [difftool "vscode"] cmd = "code…
Ala'a Ahmad
  • 3
  • 1
1 2 3 4 5
6
7 8