Changed order of gitconfig diff tool definitions to match merge tool defintion order for readability.