gitconfig: Added diff and merge options

Show mnemonics in diffs insted of a and b version, now it will show
i for indew, w for working copy, etc

Show a stats after a merge