Mercurial > hg > easyhg
diff src/hgignoredialog.cpp @ 505:1c05e7576ea5
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author | Chris Cannam |
---|---|
date | Mon, 17 Oct 2011 16:25:02 +0100 |
parents | 69b2338c06e1 |
children | 533519ebc0cb |