List the files with changes

    git diff --stat 

And git merge-tool & git diff-tool So I can use kdiff3 when I have merge conflicts.