comparison src/filestatuswidget.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 896b7903e8f2
children 7829da6abe97
comparison
equal deleted inserted replaced
504:d972f0cd61b3 505:1c05e7576ea5