* subversion/libsvn_diff/diff_file.c
  (CHUNK_SHIFT): Add a cross-reference to test_token_compare().
  (token_compare): Adjust the length to read from file not to protrude from the end of the token.

* subversion/tests/libsvn_diff/diff-diff3-test.c
  (test_token_compare): New test.
  (test_funcs): Add test.