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.
139 questions
0
votes
2 answers

Merge A and B and keep all diffs

So if file A is 1 2 3 4 and file B is 1 2 3 4a I want the output to be 1 2 3 4 4a I can manually do this in KDIFF3 but I want to automatically do this for all 4000+ diffs.
jim_albright
  • 9
  • 3
0
votes
1 answer

How difftool can show branch changes but avoiding merges?

How to use Difftool to show all changes between two revisions avoiding changes made in merges? I can use git log to show that changes with this command: git log --no-merges -p firstrevinbranch..lastrevinbranch But git log only shows changesets,…
J.C. Ruiz
  • 43
  • 6
0
votes
1 answer

KDiff3 - ignore or exclude the first 3 characters in a line if they are numeric

I am using KDiff3 as the diff tool in Git Extensions. In some of the old projects based on VB6, there are line numbers inserted at the beginning of the line. If an older version of the code file did not have line numbers, KDiff3 shows differences…
Moshe Yalovsky
  • 121
  • 1
  • 1
  • 8
0
votes
1 answer

How can I trigger automated command after completing a merge in kDiff3?

Suppose I'm in the middle of a rebase (interactive, or otherwise), and a merge-conflict is detected. The merge stops, and I run (on the cmd line) git mergetool, which has been configured to use kdiff3 as its merge-manager. I choose my merge…
Brondahl
  • 7,402
  • 5
  • 45
  • 74
0
votes
2 answers

Git markers started showing up when resolving conflicts with VS2019 + KDiff3

Today I tried to merge two branches and I ran into a conflict. I use the Visual Studio 2019 Team Explorer, and .gitconfig is set-up like this to launch KDiff3: [merge] tool = kdiff3 [mergetool "kdiff3"] path = C:/Program…
relatively_random
  • 4,505
  • 1
  • 26
  • 48
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
  • 197
  • 9
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,511
  • 3
  • 12
  • 22
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,561
  • 3
  • 15
  • 30
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
  • 988
  • 1
  • 11
  • 28
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

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
  • 2,393
  • 5
  • 22
  • 35
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
  • 416
  • 8
  • 24
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 the repository. There isn't any .git folder and I don't have original versions). There are some conflicts marked by git-merge: <<<<<<<…
ardabro
  • 1,907
  • 16
  • 31
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
  • 3
  • 1
1 2 3
…
9 10