* contrib/hook-scripts/detect-merge-conflicts.sh:   Set svn:eol-style to native.   Set all the svn:keywords and use them.
* contrib/hook-scripts/detect-merge-conflicts.sh:
  Set svn:eol-style to native.
  Set all the svn:keywords and use them.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion