Revision 1918957

Merge r1917946 from trunk:

 * r1917946
   Convert path to local style in error message from diff API
   Justification:
     Use correct dirent style in error message
   Votes:
     +1: hartmannathan, astieger, jamessan, rinrab