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
2
votes
2 answers

git bash: Can't spawn kdiff3 as difftool

I'm trying to use KDiff3 as a difftool in Git Bash on a Windows 8.1 system, and I'm admittedly pretty new to Git. I can't get KDiff3 to open when I try comparing a staged file to the committed file, and I'm confused about what to do about it. I…
shirewoman2
  • 1,842
  • 4
  • 19
  • 31
2
votes
1 answer

tortoisehg: kdiff3 doesn't run during merge

I am using tortoisehg. Kdiff3 runs when I select "diff to parent" or "diff to local" from the context menu in the workbench. However, Kdiff3 doesn't run when merging (merge with local) after a pull. The merge tool just says the following: % hg…
user1164199
  • 359
  • 4
  • 12
2
votes
1 answer

Git merge inconveniences

We are a team of developers who switched from SVN to Git thinking it would be simpler and more standard. Unfortunately, until now we only encountered failures and problems. We don't have the need for feature branches. We have a single branch called…
Dunge
  • 532
  • 3
  • 19
2
votes
1 answer

Is there a comparing tool able to merge line by line?

Currently I use kdiff with tortoise to compare files before commit. I'm searching for a tool that compares files and is able to merge (undo) a change like by line. The best example is when I add a temporary dump while coding and forget about it.…
Hikari
  • 3,797
  • 12
  • 47
  • 77
2
votes
0 answers

Web base merge tool

I'm looking for a solution to automatize merges between two branches, and I'd like to know if there are good web based merge client for manual merge (when conficts arise, human will still be better than the machine). I use a lot kdiff3 and find it…
Gaetan
  • 488
  • 4
  • 13
2
votes
1 answer

Removing .orig files in IntelliJ Idea

Is there any comfortable way in IntelliJ Idea to remove all .orig files?
sunny
  • 1,887
  • 3
  • 29
  • 40
1
vote
1 answer

Git merge with KDiff3 : navigate through automatically solved conflicts for review?

I am using Kdiff3 as my mergetool for Git. Upon running git mergetool, KDiff opens and a pop-up box shows up telling me : Total number of conflicts : n Number of conflicts solved automatically : a Unresolved conflicts : n - a At the top of the GUI…
Charles
  • 988
  • 1
  • 11
  • 28
1
vote
0 answers

KDiff3 as temporary git diff tool

I would like to use KDiff3 as Git diff tool, without losing the default text based diff tool. That is I don't want to alter the default functionality of the git diff command. Could you suggest a command line for this? Example: $ git diff ... the git…
Charlie
  • 1,750
  • 15
  • 20
1
vote
1 answer

How to restore the Visual Studio Compare/Merge tool?

I am using Microsoft Visual Studio Professional 2017. I installed KDiff3 compare tool (version 0.9.98) in in my local machine. Now, by default, file comparison (.cs extension) in Visual Studio is happening in KDiff, unlike earlier when it used to…
Abhishek Guha
  • 154
  • 1
  • 9
1
vote
0 answers

Use kdiff3 to "save a partial merge", leaving in (or adding?) unresolved conflict markers

The desired use-case might be: Launch KDiff3 via 'git mergetool' which auto-resolves most conflicts Resolve additional conflicts in KDiff3 Use a programming editor (eg. VS) to resolve remaining conflicts The title is a bit of a sinker as it's "No"…
user2864740
  • 60,010
  • 15
  • 145
  • 220
1
vote
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
  • 438
  • 3
  • 13
1
vote
1 answer

Compare two zip files using KDiff3

I have quite often to compare two zip files under Windows. Usually I unzip each of them into a temporary folder, then compare the folders with kdiff3, then delete the temporary folders. I'm looking for a way to do this with a single step, i.e.…
Christoph Jüngling
  • 1,080
  • 7
  • 26
1
vote
2 answers

diff3-like program for windows?

I'm a linux user, and normally I use kdiff3 to compare 3 (text) files between each others (for example, when there are svn conflics). I know of various programs to do that (like diff3 or meld) but none for windows. Is there a 3-file-differ for…
Vito De Tullio
  • 2,332
  • 3
  • 33
  • 52
1
vote
1 answer

Git merge conflict Tabbing in BASE

I try to merge branch A to branch B. Both in A and B had inconsistent tabbing previously due to team work, but we fixed and the current version on A and B has the same tabbing. Now, when I try to merge the two branches I have merge conflicts (not…
Elod
  • 499
  • 9
  • 25
1
vote
1 answer

git mergetool telling "No files need merging" instead of conflicting files

I was rebase master's branch to mine with following command git rebase master Then I got conflicts in many files. Then to resolve conflicts what I usually do is git mergetool -t kdiff3 And usually I resolve conflicts with kdiff3. But this time…
afzalex
  • 8,598
  • 2
  • 34
  • 61
1 2 3
…
9 10