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
13
votes
0 answers

How to hide matching lines in Kdiff3

Does anyone know of a way to hide matching lines in Kdiff3 (in Windows). I really only care about the differences and would rather quickly scroll through that list of differences without all the just filler (i.e. matching lines) in between. I'm…
Derek
  • 131
  • 3
12
votes
3 answers

git tells me that I Merge conflict, but also tells me that no files need merging

I committed some changes in the branch new. I checkout out to master. When I tried to merge: $ git merge new Auto-merging js/site.js CONFLICT (content): Merge conflict in js/site.js Automatic merge failed; fix conflicts and then commit the…
Trufa
  • 35,711
  • 41
  • 118
  • 180
11
votes
2 answers

How resolve this Mercurial conflict?

I'm frustrated with Mercurial and Python since it makes easy things difficult. I have a trivial conflict and since Mercurial does not give any suggestion what to do I don't know even how to resolve this trivial file conflict: The conflict is…
Niklas R.
  • 22,209
  • 67
  • 202
  • 380
11
votes
2 answers

kdiff3 merge does not work

While using KDiff3 to resolve merge conflicts, how do I save the resolved copy of the A and B versions? I open KDiff3 to resolve merge conflicts. I am able to resolve each conflict by selecting the desired version. When I have resolved all of the…
halcwb
  • 1,415
  • 1
  • 13
  • 24
11
votes
4 answers

How to get directory git branch diff using kdiff

I have configured kDiff3 with my git. What I need is to see directory difference between two branches. when I run git difftool command it opens all files one by one. But that is not I want.
Mahesh Chavda
  • 111
  • 1
  • 3
10
votes
2 answers

How can I configure KDiff3 on git extension?

When I open my Git extensions, the result is like this: I try to repair it. I click the repair button. But that's not action. I get some reference: Git: How configure KDiff3 as merge tool and diff tool. I try it like this: But it does not…
Success Man
  • 5,513
  • 23
  • 109
  • 205
10
votes
1 answer

How to Merge Conflicts by Selecting Lines from Both?

I'm learning the use of version control (with Tortoise HG) so this question might be very basic, but I can't figure out how to solve it. Suppose Branch A has a text file with the following: A B C D E F Branch B has the same text file…
Devdatta Tengshe
  • 3,635
  • 8
  • 41
  • 55
9
votes
1 answer

Using external diff tools with Mercurial

Anyone know how integrate ExamDiff with Mercurial? I have KDiff3 set up but couldn't figure out how to set up ExamDiff. Update: Per accepted answer, this .hgrc config worked: [extensions] hgext.extdiff = [extdiff] cmd.examdiff = C:\Program…
Marcus Leon
  • 50,921
  • 112
  • 279
  • 413
8
votes
2 answers

Git difftool kdiff3 can't edit file

I have following difftool configuration for kdiff3 in .gitconfig, [difftool "kdiff3"] external = '"C:/Program Files/KDiff3/kdiff3.exe" "$LOCAL" "$REMOTE" --output "$MERGED"' trustExitCode = false [difftool] prompt = false [diff] and I…
B Dev
  • 81
  • 1
  • 3
7
votes
2 answers

What does A (base), B (local), C (remote) in KDiff3 tied to git conflict solver?

Lets assume i have a git branch FIX-8834 and branch VERSION-12. I want to merge FIX-8834 to VERSION-12 in git. Git tells there is a conflict. I use Kdiff3 to solve it. KDiff3 opens and there are 3 files open: A(base), B(local) and C(remote). What…
Tomasz Smykowski
  • 24,175
  • 51
  • 149
  • 222
7
votes
3 answers

How to use visual merging tools?

I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?
Jader Dias
  • 81,082
  • 147
  • 410
  • 611
7
votes
1 answer

Can Mercurial use a better diff tool to more efficiently store its changesets?

I use TortoiseHg to commit changes. The (default) diff that is shown in the commit dialog contains a lot of additions/deletions. But in contrast when I click on the diff icon in the commit dialog, KDiff3 opens and that comparison is a lot more…
jan
  • 1,545
  • 2
  • 19
  • 33
7
votes
1 answer

smartgit and kdiff3 integration

The merge tool that come with smartgit is very confusing. I am not able to configure kdiff3. I dont get to configure the common ancestor. These are the only three files they give me to configure: ${mergedFile} ${rightFile} ${leftFile} Is there a…
Rajani Karuturi
  • 3,197
  • 2
  • 23
  • 39
6
votes
2 answers

Copy single difference in kdiff3

Is it possible to copy only one change or many changes one by one in kdiff? There are such options in WinMerge which allow to copy chnge from one file to second file without merging. I need to copy few changes from one file to another and want to do…
Krzysiek Grzembski
  • 898
  • 10
  • 20
6
votes
0 answers

KDiff3 (on Windows): ignore Line end style

I´m comparing two versions of a C code, and some files differ only for the Line end style (Unix or DOS). How can I tell KDiff3 to ignore such difference? Note: I cannot pre-process the code with dos2unix on one of the two versions I´m using…
Sara
  • 185
  • 2
  • 11
1
2
3
…
8 9