Version 2.10

- ENH: Define both normal and visual mode mappings for all mappings, not the exclusive either-or. The new visual mode mappings will select the corresponding section in all conflicts found in the selected range. (Application on a partially selected conflict is denied by an error since version 2.02.)
- ENH: Enable repeat of all mappings, also (with visualrepeat.vim) across modes. Thanks to Maxim Gonchar for the suggestion.
- Handle folded ranges overlapping the conflicts. Thanks to Maxim Gonchar for reporting this. When querying which conflict sections to keep, open folds so that if possible the entire conflict is visible, but at least the section markers.
- Re-allow combining range inside conflict with section argument, but only for the :ConflictTake command, not the mappings.