Mercurial > hg > mercurial-crew-with-dirclash
diff setup.py @ 819:77e121a0d870
Update output for test-merge5.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 31 Jul 2005 17:31:15 -0800 |
parents | 7f5ce4bbdd7b |
children | f5faab34f32e |
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 31 Jul 2005 17:31:15 -0800 |
parents | 7f5ce4bbdd7b |
children | f5faab34f32e |