Fix some tests that were failing due to tree conflict handling. Tests 10 and 11 of blame_tests.py, and 16 17 18 19 of log_tests.py, now pass.
Fix some tests that were failing due to tree conflict handling.
Tests 10 and 11 of blame_tests.py, and 16 17 18 19 of log_tests.py, now pass.

* subversion/tests/cmdline/log_tests.py
  (merge_history_repos): Resolve a tree conflict that was causing this set-up
    function to fail.


git-svn-id: 080e87057772675a7b26c87dbedb1538c5b5954e@871401 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion