Rename basic_reintegrate to reintegrate_with_rename, since in fact it's not as basic as it looks.
Rename basic_reintegrate to reintegrate_with_rename, since in fact
it's not as basic as it looks.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_rename): Rename from basic_reintegrate.
  (test_list): Adjust.


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

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