Checkout Tools
  • last updated 3 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r34171 from trunk:

* r34171

Fix: interactive resolve's 'diff-full (df)' errors out in locales

such as zh_CN.GBK, due to a failure in character encoding when

outputting the diff header.


Very unfriendly to error out during a merge.

Simple fix (UTF-8-encode the date string from APR).


+1: julianfoad, rhuijben, danielsh

  1. … 6 more files in changeset.
Revert r34200 because it accidentally included the nominated change as well as the nomination.
  1. … 1 more file in changeset.
* STATUS: Nominate r34171 (fix a character encoding failure).
  1. … 1 more file in changeset.