Setting up KDiff3 to work with TortoiseGIT

Setting up KDiff3 to work with TortoiseGIT

When I work with git I do most of my work on the command line except for a few tasks. Resolving conflicts is one of them. So when it comes to resolving conflicts I prefer the KDiff3 instead of the TortoiseGIT diff. I was googling around to find the proper way and after grabbing things from difference places here is what I did.

Obvious steps  :)

1. Install git
2. Install KDiff3
3. Install TortoiseGIT

Then after that

1. Open tortoise GIT settings
1. Go to "Diff Viewer"
2. Go to section "Configure the program used for comparing different revisio...."
3. Choose "External"
4. Enter the following "[ kdiff3 instalation path ]\kdiff3.exe %base %mine --L1 %bname --L2 %yname"
5. Go to "Merge Tool"
6. Choose "External"
7. Enter the following "[ kdiff3 instalation path ]\kdiff3.exe %base %mine %theirs -o %merged"
8. Click apply

I will soon write something to show how to actually resolve conflicts using this setup.