Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-empty-dir.out @ 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 | e33c85d2812a |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |