From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 3 Jun 2016 07:38:24 +0000 (+0300)
Subject: Issue #27185: Rename test_string_merged.py back to test_string.py.
X-Git-Tag: v3.5.2rc1~75^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10fd0aaf8b2dae1101cc2e33d15ecd43911aa3a1;p=thirdparty%2FPython%2Fcpython.git

Issue #27185: Rename test_string_merged.py back to test_string.py.
---

diff --git a/Lib/test/test_string_merged.py b/Lib/test/test_string.py
similarity index 100%
rename from Lib/test/test_string_merged.py
rename to Lib/test/test_string.py