Author: Armin Rigo <ar...@tunes.org> Branch: stmgc-c7 Changeset: r76405:19a20e7c5d93 Date: 2015-03-16 16:22 +0100 http://bitbucket.org/pypy/pypy/changeset/19a20e7c5d93/
Log: merge heads diff --git a/pypy/module/pypystm/test_pypy_c/test_conflict.py b/pypy/module/pypystm/test_pypy_c/test_with_conflict.py rename from pypy/module/pypystm/test_pypy_c/test_conflict.py rename to pypy/module/pypystm/test_pypy_c/test_with_conflict.py _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
