Commits are now allowed when a merge integration has occured even when no files are modified

Support for forced merges
Context menus are offset by a pixel to prevent unintended clicks


FossilOrigin-Name: b0f81bc9c4d226d8406f65d9ad02099205d7e067

src/Workspace.h

@@ -123,6 +123,7 @@ public:
 	stashmap_t			&getStashes() { return stashMap; }
 	QStringMap			&getTags() { return tags; }
 	QStringList			&getBranches() { return branchList; }
+	bool				otherChanges() const { return isIntegrated; }
 
 private:
 	Fossil				bridge;
@@ -131,6 +132,7 @@ private:
 	stashmap_t			stashMap;
 	QStringList			branchList;
 	QStringMap			tags;
+	bool				isIntegrated;
 
 	QStandardItemModel	repoFileModel;
 	QStandardItemModel	repoDirModel;