Stack Overflow
Stack Overflow

Questions tagged [kdiff3]

KDiff3 is a diff/merge program that compares or merges two or three text input files or directories and shows the differences line by line and character by character (!).

KDiff3 is a diff and merge program that:

  • compares or merges two or three text input files or directories,
  • shows the differences line by line and character by character (!),
  • provides an automatic merge-facility and
  • an integrated editor for comfortable solving of merge-conflicts,
  • supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark "BOM"
  • supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
  • Printing of differences,
  • Manual alignment of lines,
  • Automatic merging of version control history ($Log$),
  • and has an intuitive graphical user interface.
134 questions
0
votes
1 answer

git difftol --dir-diff beteen head and files in staging area

I have the following in my ~/.gitconfig dt = difftool --dir-diff [diff] tool = kdiff3 So if I want to see what have changed since for example previous commit and the last one I run: git dt HEAD HEAD~1 (or git dit HEAD~1 HEAD, doesn't…
xor256
  • 177
  • 8
0
votes
0 answers

Use kdiff3 to resolve rebase conflicts

I'm performing a rebase of my feature branch with the master branch on a project. The rebase resulted with some conflicts (which is expected). I'm at stage when I need to resolve those conflicts and type git rebase --continue when that is ready. So,…
Limak
  • 1,451
  • 2
  • 12
  • 20
0
votes
1 answer

Kdiff do not load files after merge conflicts

After doing the git extension update, stopped loading files while resolving conflicts I get an empty window where there are no files in the base, local and remote version(but files are created in folder with *.base, *.local, *.remote…
rad11
  • 1,411
  • 2
  • 14
  • 27
0
votes
1 answer

Can KDiff3 be used for compare/diff in Visual Studio 2017?

I'd like to use KDiff3 as the compare and merge tool in Visual Studio 2017. Is this possible, and if so, how? I've googled but haven't found which arguments to use for the compare and merge operations in Visual Studio. The Visual Studio settings for…
Spacewaster
  • 418
  • 3
  • 12
0
votes
1 answer

Review merge actions with KDiff after successful automated solving of merge conflicts

I use KDiff as a merge tool with Git. After an unsuccessful Git Merge, I started solving conflicts for individual files with git mergetool, which calls KDiff as specified in my config. However for one file it said "Number of conflicts : x. Number of…
Charles
  • 696
  • 6
  • 22
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
  • 31
  • 1
  • 5
0
votes
0 answers

kdiff3 mergetool produces untracked files

This is my first time using kdiff3 merge tool. I am using mac os, so I installed kdiff3 with homebrew with the manual below. http://www.ryanwright.me/cookbook/mac/homebrew/kdiff3 I have added merge.tool kdiff3 in my .gitconfig git config --global…
jwkoo
  • 1,518
  • 2
  • 13
  • 24
0
votes
1 answer

Auto merge using regex

KDiff3 has option automatic merge regular expression. In case of conflict KDiff3 resolve it automaticlly using REMOTE changes. But I want to resolve it using LOCAL changes. My question: Is there possibility to resolve conflict automatically by some…
Egor Novikov
  • 96
  • 4
  • 18
0
votes
2 answers

Is here any gui tool that can show file with conflicts side-by-side?

I have a couple of conflicted files and I don't have access to source branches (these files are detached from repository, there is no .git folder and I don't have original versions). There are some conflicts marked by git-merge: <<<<<<< HEAD …
ardabro
  • 1,446
  • 13
  • 24
0
votes
0 answers

GitKraken change highlight of changed code in diff (like on screenshot)

Image :) First part of screenshot is from GitKraken, second is from GitDesktop.. how to change it? I want to use highlight like on second part.
Zawodowiec
  • 3
  • 1
0
votes
0 answers

kdiff3 : Auto save and quit on merge without conflits don't work

I try to merge 2 directories with some differents files with kdiff3. Unfortunaly, when I start directory merge, it stop at each file, even there are no conflits, and I need to restart it. I check the option "Auto save and quit on merge without…
Alizia Kaline Carina
  • 13
  • 1
0
votes
1 answer

Fix Git UU with VI

When I pull the code from remote, the git reports conflicts on one file. UU hello.cpp If I use git mergetool hello.cpp and fix the conflict, then git shows the following: The default mergetool is kdiff3. M hello.cpp However, if I use vi to fix the…
q0987
  • 31,246
  • 61
  • 222
  • 356
0
votes
1 answer

Creating a wrapper over an open source diff tool

I want to write a wrapper over some open source diff tool. Say kdiff3. Suggesting the way to do the same. The diff tool shows as per file what is the diff in the code. I want it to perform specific task as per my requirement and automatically…
PKSA
  • 115
  • 1
  • 7
0
votes
2 answers

How to compare Excel files (.xlsx) with Kdiff3?

I added Kdiff3 as my external diff tool in Source tree as shown in the figure. But when I select two commits from Master and click on External Diff from Actions, kdiff3 is showing non-readable text as shown.
Drools123
  • 55
  • 1
  • 11
0
votes
2 answers

How do I open a (Mercurial) patch file in a human-readable format (preferably with kdiff3)?

The Mercurial command hg diff > mypatchfile compiles a "patch" file representing the differences between the working directory and the last commit. Opening this file as plain text results in a presentation of the changes that is quite difficult to…
andreasdr
  • 3,172
  • 4
  • 21
  • 29
1 2 3
…
8
9