New feature:

• If any conflicted files have been left, they will be reported.

Fixed:

• Now the name of the conflicting file is shown on the conflict-resolving dialogue.
• Hidden files are now able to be merged again.
• No longer error caused at plug-in being loaded.

Improved:

• Caching chunks are now limited in total size of cached chunks.
  • We can configure the limit for with surplus capacity, in the setting dialogue.