Improve documentation for merging
Merge pull request #2132 from ethomson/merge_doc

Improve documentation for merging
Staticize file-local variables
Avoid casting warning
Prevent icc warning
Use a portable cast
Merge pull request #2134 from libgit2/ben/icc

Fix Intel compiler warnings