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
3
votes
1 answer

merge 2 local files

I have 2 local files that I need to merge. Neither is versioned in the git. Is there a linux command to merge files? I tried merge, but didn't get any useful output. The mergefile seemed to show that the entire first file was deleted and the…
ewok
  • 20,148
  • 51
  • 149
  • 254
2
votes
0 answers

Cannot Launch KDiff3 External Merge Tool from Sourcetree

I am having an issue with source tree. I have a conflict in my merge, and tried to run kdiff3. for some reason it is not work with the new sourcetree. this is my source tree config this is what display on screen after I try to run external merge…
Bastian
  • 1,089
  • 7
  • 25
  • 74
2
votes
1 answer

How do I manually check the difference between two git commits?

How do I manually check the difference of files between two commits in the same git folder. There's a ton of posts here how to configure git to use kdiff3 as the default merge tool but this question relates to manually attaching directories so that…
johnqq231
  • 33
  • 4
2
votes
2 answers

kdiff3 downloadable "kdiff3-1.8.5-windows-64-cl.exe" - what is the "-cl"?

I was looking to download kdiff for windows from https://download.kde.org/stable/kdiff3/ and I noticed the latest package is kdiff3-1.8.5-windows-64-cl.exe while the next-latest is kdiff3-1.8.4-windows-64.exe Does the -cl signify anything like a…
user2407039
  • 21
  • 2
2
votes
1 answer

Three-way diff from clipboard

I know Kdiff3 can do diff from clipboard but only 2-way. Is there a tool that allow me copy&paste three text and compare it? Now I have to create three files with the text I copied and compare them. After I delete them. Can't be online tool.
JrBenito
  • 973
  • 8
  • 30
2
votes
1 answer

Merging 3 XML files with kdiff3 (Command Line)

I need 3-way-merge of xml file, for this I am using kdiff3. The problem I am facing with kdiff3 is whenever there is the conflict in merging, kdiff3 is opening the kdiff3-GUI tool and ask to resolve a conflict. Kdiff3 is not saving the file with the…
Sanket
  • 945
  • 11
  • 24
2
votes
1 answer

Suppress needless dialogs from kdiff3?

I use kdiff3 on Windows as the visual merge tool for TortoiseHG / Mercurial. Often when doing a merge or rebase it will show a dialog like this: Another variation is that the two files being merged were "binary equal". Since these messages are…
StayOnTarget
  • 11,743
  • 10
  • 52
  • 81
2
votes
0 answers

simple bash process substitution not working with kdiff3 and hexdump

I want to kdiff3 the hexdumped versions of two binary files. At first I was using an amateurish two step process of hexdump, then kdiff3. However, I recently learned about bash process substitution. For some reason it doesn't work for my case,…
jjarmagost
  • 63
  • 5
2
votes
3 answers

Mercurial with KDiff3 -- can it directly expand all folders?

With Mercurial, every time a hg vdiff which invokes kdiff3, there are 2 steps that need to be done: 1) close the pop up that says how many files are diff'ing 2) go to Directory -> Unfold all Subdirs Is there a way to skip the step 1 and step 2…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
2
votes
1 answer

How to Set TortoiseHG on Mac to diff with 2 parents?

Here is my settings file: [extensions] hgext.extdiff = [extdiff] cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3 [tortoisehg] vdiff = kdiff3 [ui] merge = kdiff3 [merge-tools] kdiff3.executable =…
Noel Pure
  • 422
  • 2
  • 13
2
votes
1 answer

How to use regular expressions in kdiff3 when merging two git files

I was wondering if someone could help me with explanation how to merge two files using regular expressions. I am trying to bring back comments that were removed in one of the branches. The problem is that there are over 600 of them. I tried to set…
Andre
  • 61
  • 1
  • 7
2
votes
3 answers

Kdiff and hg: Unresolved conflicts after auto merge

We are using Mercurial (+Tortoise Hg) as VCS and Kdiff as diff and merge tool. Some files are merged automatically and sometimes this auto merge result is wierd: public static Method() <<<<<<< local { DoSmth(); } ======= { …
VorobeY1326
  • 782
  • 10
  • 25
2
votes
0 answers

Silent merge tool for git

I have a build server set up to automatically keep a few products up to date with code from a "common" repository. The build server merges in the common code, runs all tests and if OK it commits the results. Everything is fine until there is merge…
tkarls
  • 3,171
  • 3
  • 27
  • 27
2
votes
1 answer

Kdiff3 FSPathMakeRef(app_path_location) failed with error -43 Mac OS-X

I am trying to open kdiff3 from the terminal and pass two local file as argument of kdiff3 (not in git repo). Kdiff3 I am using as git diff tool thats works perfectly fine to compare my current version and repo head version. However, the problem…
J4cK
  • 30,459
  • 8
  • 42
  • 54
2
votes
1 answer

In KDIFF3 How to automatically overwrite any whitespace conflict for all files

In Kdiff3, when comparing between two directories with multiple files and folders and there are multiple white space conflicts in each file. I have to go through each file and manually click on "merge" and choose "Choose (A or B) for all unsolved…
Naguib Ihab
  • 4,259
  • 7
  • 44
  • 80
1 2 3
…
9 10