« back to all changes in this revision
Viewing changes to bzrlib/merge_core.py
- Committer: Martin Pool
- Date: 2005-05-10 08:15:58 UTC
- Revision ID: mbp@sourcefrog.net-20050510081558-9a38e2c46ba4ebc4
- Patch from Fredrik Lundh to check Python version and
try to find a better one if it's too old.
Patched to try to prevent infinite loops in wierd configurations,
and to log to stderr.
try to find a better one if it's too old.
Patched to try to prevent infinite loops in wierd configurations,
and to log to stderr.
added
removed
bzrlib/merge_core.py
