Questions tagged [difftool]
107 questions
0
votes
1 answer
git: view source code of specific commit in parallel
I am working on source code and want to review the code of a previous commit. Usually I would do this with git difftool --dir-diff and meld as the difftool. However, when I want to look at a farther back commit, or a commit that was prior to a…
earthling
- 620
- 6
- 20
0
votes
1 answer
Git difftool not working Windows 10 Git Bash
I installed diffmerge and pasted this into my .gitconfig file in my C:/Users folder.
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe\"$LOCAL\" \"$REMOTE\"
[merge]
tool =…
an4s911
- 411
- 1
- 6
- 16
0
votes
1 answer
Difftool showing difference between two branches but Mergetool says "No files need merging"
I am trying to merge two branches
alpha_critical
gamme_mine
gamme_mine is mine and would need everything from alpha_critical
When i do
git difftool f78606e3c60 94482fe3610
it shows all of the files which are different in these two commits from…
Wkhan
- 95
- 3
- 11
0
votes
1 answer
Git Difftool problem with qt.qpa.plugin: Could not find the Qt platform plugin "cocoa" in ""
I cannot get 'git difftool' to launch P4merge after installing P4merge on my Mac (mac0S 10.13) via the vendor package from the website (rather than Home brew) and configuring my 'git config --global' file like this:
[user]
name = (my name)
email =…
Dugzilla
- 11
- 4
0
votes
1 answer
`git difftool` doesn't show added files on Windows
git difftool seems to get confused on Windows. If a new file has been added, Git sends "\.\nul" as the 'left' file to the diff tool.
To reproduce this:
{create a new file}
git add .
git difftool --staged
Now, WinMerge (or whichever viewer you're…
Tom B
- 115
- 8
0
votes
1 answer
Kdiff3 - Tool launch failure in TortoiseHg
I am having issues with my TortoiseHg when it tries to launch Kdiff3.
It gives me an error "C:\Program Files\TortoiseHg\lib\kdiff3.exe: [Error 2] The system cannot find the file specified". I couldn't find any solutions online.
I do have kdiff.exe…
user3344235
- 51
- 1
- 5
0
votes
0 answers
How to use git difftool inside a Jenkins job?
I'm using git to manage configuration revisions.
I would like to run difftool during jenkins job to allow the user to decide which line is correct during the job. is there any plugin that can do this?
example: ( file was changed in workspace and…
chenchuk
- 5,324
- 4
- 34
- 41
0
votes
1 answer
How to set multiple column lines (grid lines) in Beyond Compare 4?
Currently I'm able to set one column line already using the Options > Tweaks > Show column line at option.
How do I set multiple column lines / grid lines?
sangeethkumarp
- 88
- 5
0
votes
1 answer
git difftool diff history version, show up so many windows
When I use git difftool to compare 2 history version of 1 file. I met a problem. After I enter the command, it will show hundreds of windows.
> git log --pretty=oneline
...
>…
BBKing
- 5
- 4
0
votes
0 answers
How can I get git difftool side-by-side diff to show filenames?
I've got a really nice side-by-side difftool command:
git difftool -y -x "diff --suppress-common-lines -b -y -W 225"
and all it's lacking is filenames. What switches do I need to add, to make the filenames appear? I don't care where they appear…
jaygooby
- 2,436
- 24
- 42
0
votes
1 answer
How do you change the program team explorer uses for comparisons?
I would like to have team explorer use BeyondCompare or SourceGear's diffmerge in order to do my conflict resolution in team explorer. I know its possible, but where is the setting for that and what is the syntax for it?
DevelopingChris
- 39,797
- 30
- 87
- 118
0
votes
1 answer
difftool - Only loading 1 version of gitfile instead of 2
I'm trying to use INET PDFC as a difftool for comparing different versions of a pdf file.
Config file
...
[diff]
tool = pdfc
[difftool "pdfc"]
cmd = 'C:/Program Files (x86)/i-net PDFC/PDFC.exe' $LOCAL $REMOTE
When I run git difftool HEAD…
Cedric Berlanger
- 63
- 6
0
votes
1 answer
Missing git difftool for windows git bash
I want to use difftool as the tool for dealing with git diff's. Specifically, I am used to using Vimdiff on an Linux environment. It doesn't seem that any tools come with git on Windows. I am running a Git Bash and I got the following…
user1015214
- 2,733
- 10
- 36
- 66
0
votes
1 answer
Mercurial & TortoiseHg - args error to config a diff tool?
I'm trying to configure a diff tool in TortoiseHg and Mercurial.
This is the configuratión I've done:
[merge-tools]
CmpIt.executable = E:\Program Files (x86)\Compare It!\wincmp3.exe
CmpIt.priority = 1
CmpIt.premerge = True
CmpIt.gui =…
avij67
- 1
- 1
- 2
0
votes
1 answer
How to setup difftool to use pager
If I use a difftool that has simple shell output how to use pager that is set up in core.pager .gitconfig section?
chestozo
- 1,203
- 1
- 12
- 29