diff tests/test-merge6.out @ 4947:3e25a6eb5c9a

lock.py: cache hostname, but not pid, in case we fork
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 19 Jul 2007 15:13:48 -0700
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff