Fix a test's EOL-style portability problem introduced in r32907, and enabled
in r32913, that caused it to fail on Windows.

Suggested by: pburba

* subversion/tests/cmdline/merge_tests.py
(merge_an_eol_unification_and_set_svn_eol_style): Write out the initial
file contents in binary mode to get the exact EOL style combination we
want.

Fix typos in comments.

* subversion/libsvn_client/cmdline.c
(resolve_repos_relative_url):
* subversion/libsvn_repos/load.c
(new_revision_record):
* subversion/libsvn_wc/merge.c
(svn_wc__merge_internal):
* subversion/svnadmin/main.c
(main):
* subversion/svndumpfilter/main.c
(main):
* subversion/svnlook/main.c
(main):
* subversion/svn/main.c
(main):
* subversion/svnversion/main.c
(main): Fix typos in comments.

Use svn_diff_file_output_merge2() instead of deprecated
svn_diff_file_output_merge().

* subversion/libsvn_wc/merge.c
(svn_wc__merge_internal): Use svn_diff_file_output_merge2() instead of
deprecated svn_diff_file_output_merge().

Fix a Python syntax error I introduced in r32906, that worked in the version
I was using but failed on a MacOSX build-bot.

* subversion/tests/cmdline/merge_tests.py
(svn_propset): Explicitly cast the generator expression to a tuple before
passing it as a variadic argument.

Follow-up to r32012.

* build/generator/gen_vcnet_vcproj.py
(write_project): Remove duplicate condition.

Make win-test.py work with non ASCII locale.

* win-tests.py:
Remove LastChangedDate and LastChangedBy fields because Python does
not like non ASCII characters.