Welcome !

1. git config

---

3 types of git config file

1. Local named as gitconfig. mingw32\etc
2. Global named as .gitconfig. C:\Users\git-user\
3. Systemnamed as config .git directory

---

2. setting margetool kdiff3

---

for windows 👍

• install kdiff3
• go to global git config file
• edit the file

    tool = kdiff3
[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false
[diff]
    guitool = kdiff3
[difftool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false 

for ubuntu 👍

• edit git config file

 [mergetool "kdiff3"]
       cmd = kdiff3 $BASE $LOCAL $REMOTE -o $MERGED