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?

Eric


On Thursday, September 20, 2012 10:06:37 AM UTC-4, EricP wrote:
>
> Hi,
>
> I'm running windows 7 / 64 bits. Here's my version of Git:
> $ git --version
> git version 1.7.11.msysgit.1
>
> I installed KDiff3 version 0.9.96.
>
> I don't have any error message when I launch the mergetool: when a 
> conflict occurs during a merge, I use this command:
>
> $ git mergetool
>
> but no sign of life from kdiff3 at all. Not even an error message, no 
> warning. Just silently fails. I looked in the task manager and no 
> kdiff3-related processes are visible.
>
> That used to work in the past. I even tried uninstall / re-install Git on 
> my machine.
>
>
> Hope these bits of info are helpful!
>
>
>
>
>
> On Wednesday, September 19, 2012 9:06:12 AM UTC-4, Thomas Ferris 
> Nicolaisen wrote:
>>
>> What command are you trying to run, and what error message are you 
>> getting?
>>
>> Please also describe your environment (operating system, shell, version 
>> of Git, etc).
>>
>> On Wednesday, September 19, 2012 2:57:20 PM UTC+2, ericpar wrote:
>>>
>>> Hi, 
>>>
>>>     I used to use 'kdiff3' as my mergetool for git. I'm running git v 
>>> 1.7.11.msysgit.1 on Windows 7 64 bits. It used to work for about 8 
>>> months up to this week. 
>>>
>>>     I tried manually configuring my mergetool through these commands: 
>>>
>>> $ git config --global mergetool kdiff3 
>>>
>>> Also, I checked my ~/.gitconfig file had the following content: 
>>>
>>> (...) 
>>> [merge] 
>>>         tool = kdiff3 
>>> [mergetool "kdiff3"] 
>>>         path = C:/Program Files (x86)/KDiff3/kdiff3.exe 
>>>         keepBackup = false 
>>>         trustExitCode = false 
>>> [diff] 
>>>         guitool = kdiff3 
>>> [difftool "kdiff3"] 
>>>         path = c:/Program Files (x86)/KDiff3/kdiff3.exe 
>>>
>>>     I can start kdiff3 from the command prompt without any issue: I 
>>> added the path to kdiff3.exe in my PATH env variable. 
>>>
>>>     Any ideas what could cause my problem and how to fix it? 
>>>
>>> Cheers, 
>>>
>>> -- 
>>> Eric Parent 
>>> <mailto:er...@eparent.info> 
>>>
>>

-- 
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/-/pXy3fPaCXwkJ.
To post to this group, send email to git-users@googlegroups.com.
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.

Reply via email to