Recent Posts
- (09/10) Fixing Warning: the ECDSA host key for 'github.com' differs from the key for the IP addressTAGS:Web Server Admin
- (12/26) CakePHP 3 - Getting List of Column Definitions from a Table (like schema())TAGS:CakephpCake3
- (09/14) Change Order of Loaded Behaviors in CakePHP 3TAGS:Cake3CakephpWeb ProgrammingPhp
- (05/29) CakePHP 3 - Accept JSON Header Only Working When Debug FalseTAGS:Web ProgrammingCakephpCake3
- (05/23) Remove All Events from Google Calendar (Reset Calendar)TAGS:Web ProgrammingPhp
- (11/08) Google Tag Manager (GTM) Not Firing Default PageView EventTAGS:Web ProgrammingJavascriptGoogle Tag Manager
- (10/13) In PHP, how do you get __toString() Magic Method Result without calling echo?TAGS:CakephpCake3Cakephp 13PhpWeb Programming
- (11/14) Getting output from shell_exec() at all timesTAGS:Web ProgrammingWeb Server Admin
Subscribe to my feed
MainelyDesign.com Blog
Using KDiff3 as Git GUI Merge Tool on Windows XP and Windows 7
Posted on 09/23/2010 at 01:39 pm by Kevin Wentworth
Viewed 51,266 times | 0 comments
I've been looking for the silver bullet solution to using KDiff3 as my git mergetool on Windows (using Git GUI). I've finally got a solution that works in every Windows environment I've tried:
- Add the KDiff3 directory to your Windows System Path (e.g. C:\Program Files\KDiff3\)
- Add kdiff3 as your Git mergetool (From Git Bash, run git config --global merge.tool kdiff3)
- Add kdiff3 complete path to Git Config (From Git Bash, run git config --global meregtool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe")
- Go into Git GUI settings and set the mergetool to kdiff3 (if Git GUI doesn't pick up this setting from git config, which it should)
Regardless of what I tried and/or read online, setting all possible settings is the only way KDiff3 works every time I select "Run Merge Tool" from the Git GUI right-click menu when there is a merge conflict.
Cheers,
-Kevin Wentworth
Tags for Using KDiff3 as Git GUI Merge Tool on Windows XP and Windows 7
Git | Usage | Tutorial | Software | Windows
Comments for this Posting
No comments. Be the first to post a reply.
Sorry, comments are closed for this posting.
Please Email Kevin if you have any questions. Thanks!