Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict.out @ 1284:59d07a6bd513
Fix Volker's modifications to setup.py for non-Windows systems.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 20 Sep 2005 21:29:07 -0700 |
parents | 5a034646e472 |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1283:f5faab34f32e | 1284:59d07a6bd513 |
---|