Mercurial > hg > mercurial-crew-with-dirclash
diff templates/map-rss @ 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 | 765182a4c843 |
children | 2810c625ca98 |