[pypy-svn] r51250 - pypy/dist/pypy/config/test

[arigo at codespeak.net]

Author: arigo
Date: Mon Feb  4 14:05:55 2008
New Revision: 51250

Added:
   pypy/dist/pypy/config/test/test_pypyoption.py.merge.tmp
      - copied, changed from r51249, pypy/dist/pypy/config/test/test_pypyoption.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/asmgcroot/pypy/config/test/test_pypyoption.py
revisions 50007 to 51249:

    ------------------------------------------------------------------------
    r50987 | cfbolz | 2008-01-24 19:34:28 +0100 (Thu, 24 Jan 2008) | 2 lines
    
    unify the various options for chosing a GC root finding algorithm
    
    ------------------------------------------------------------------------
    r50261 | arigo | 2008-01-02 16:31:17 +0100 (Wed, 02 Jan 2008) | 3 lines
    
    Branch the branch, to play with a more flexible implementation of
    trackgcroot.py.
    
    ------------------------------------------------------------------------
    r50009 | arigo | 2007-12-22 16:16:48 +0100 (Sat, 22 Dec 2007) | 2 lines
    
    A branch in which to try out the llvm.gcroot() operation.
    
    ------------------------------------------------------------------------