Mercurial > hg > mercurial-crew-with-dirclash
comparison setup.py @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 7f5ce4bbdd7b |
children | f5faab34f32e |
comparison
equal
deleted
inserted
replaced
767:61ed30e82b27 | 768:20e95c245bc3 |
---|