On Thursday, September 20, 2012 10:12:49 PM UTC+2, EricP wrote: > > Seems like I have an answer... > > Today, kdiff3 was working when I needed to resolve merge conflicts, not > working on others. Seems like there is merge resolution that is being > handled by kdiff3 that Git could not go through. So the mergetool isn't > only used for "showing" the conflicts and enabling the user to resolve > conflicts by hand. > > Pretty neat in my opinion. But I thought Git was equipped with cutting > edge merge algorithms. Seems like KDiff3 has some complementary tools! > > Does that make sense? >
If what you are saying is that KDiff does not start if Git manages to resolve all conflicts on its own, then yes that makes sense. If there are no remaining conflicts after a merge (see git status), there is nothing left for KDiff to do. You can configure difftool<http://www.kernel.org/pub/software/scm/git/docs/git-difftool.html>to use KDiff, and then study the last commit like this: git difftool -t kdiff HEAD~1 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/uh62HbZ9kZIJ. To post to this group, send email to firstname.lastname@example.org. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.