Mercurial > hg > mercurial-crew-with-dirclash
diff setup.py @ 792:49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 23 Jul 2005 17:14:05 +0100 |
parents | 7f5ce4bbdd7b |
children | f5faab34f32e |