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
This commit is contained in:
kostas
2015-05-03 12:27:11 +00:00
parent cdba8c05f6
commit 894f980a7c
10 changed files with 84 additions and 27 deletions

View File

@@ -1 +1 @@
ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
b0f81bc9c4d226d8406f65d9ad02099205d7e067