1.1.0 (2026-04-11)

Features

• add project-wide conflict quickfix list via ConfluxQuickfix command (10b235a)
• document ConfluxQuickfix command and cq keymap in README and help (71ab4f5)
• allow individual keymaps to be disabled by setting them to false (9a6b6e1)

1.0.1 (2026-03-21)

Bug Fixes

• use commit sha instead of tag name for stable tag to avoid unresolved ref error (8f8d0ba)

1.0.0 (2026-03-21)

Features

• add conflict block navigation with ]c/[c keymaps and ConfluxNext/ConfluxPrev commands (59e78d2)
• add core Lua modules for conflict detection, resolution, and configuration (f75e0bd)
• add debounced TextChangedI re-scan for real-time conflict detection (1c0fb32)
• add extmark-based highlight module for conflict blocks (8619d55)
• add plugin entry point with autocommands and user commands (a3fe84c)
• add resolve-all commands/keymaps and rename none keymap from c0 to cz (3be8fe1)
• show right-aligned keymap hint on conflict marker lines (f1fc820)
• enable default_mappings by default (eb55013)

Bug Fixes

• silently discard malformed or unterminated conflict blocks instead of erroring (9135177)
• expose public API and fix cursor target window for non-focused buffers (c5f3b6c)

Documentation

• add README and Vim help documentation (fe2ebe6)
• add installation examples for vim-plug, mini.deps, and pathogen; fix repo name in lazy.nvim and packer.nvim examples (9ca3e16)
• fix placeholder repo name and add missing resolve-all, navigation, and all_keymap_hint docs (bfbae82)