Test for log -g on a merged revision where a path got explicit mergeinfo added when before the merge it had only inherited mergeinfo.
Test for log -g on a merged revision where a path got explicit mergeinfo
added when before the merge it had only inherited mergeinfo.

* subversion/tests/cmdline/log_tests.py
  (global): import some merge_tests.py objects needed by new test.
  (merge_sensitive_log_added_mergeinfo_replaces_inherited): New test.
  (test_list): Add merge_sensitive_log_added_mergeinfo_replaces_inherited,
  mark as XFail.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@872310 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion