Const up members of git_merge_file_result

@arthurschreiber noticed that I had been very sloppy when I made `git_merge_file_result` a public structure and the members should have been decorated as `const`.  Also, that we use `char *` for strings, not `unsigned char *`.  It's almost as if I've been living in a cave and writing code in bizarre languages lately!