Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
Metadata-Version: 1.0
Name: mercurial
Version: 0.6
Summary: scalable distributed SCM
Home-page: http://selenic.com/mercurial
Author: Matt Mackall
Author-email: mpm@selenic.com
License: GNU GPL
Description: UNKNOWN
Platform: UNKNOWN