What's Changed

• fix: Discard git ls-files output by @dan-woz in #11
• Support stash conflict markers in headhunter.nvim by @Faria22 in #8
• Add quickfix listing and improve conflict handling by @Faria22 in #9
• Always register default keymaps by @Faria22 in #10

New Contributors

• @Faria22 made their first contribution in #8

Full Changelog: v1.2.0...v1.3.0

What's Changed

• Add register_keymaps flag to optionally disable automatic keymap registration by @Marfien in #7

New Contributors

• @Marfien made their first contribution in #7

Full Changelog: v1.1.0...v1.2.0

What's Changed

• Feature/support backward conflict navigation by @StackInTheWild in #4

Full Changelog: v1.0.1...v1.1.0

What's Changed

• fix: Read keymaps from user modified config table by @dan-woz in #1

New Contributors

• @dan-woz made their first contribution in #1

Full Changelog: v1.0.0...v1.0.1

Introducing headhunter.nvim, a Neovim plugin to make resolving git merge conflicts faster and easier.

🔹 Features

• Jump directly to the next conflict with ]g
• Resolve conflicts with intuitive defaults:
  • <leader>gh → Take HEAD
  • <leader>go → Take origin
  • <leader>gb → Take both
• Fully customizable keymaps
• Lightweight, pure Lua — no external dependencies

🔹 Installation (lazy.nvim)

{
  "StackInTheWild/headhunter.nvim",
  config = function()
    require("headhunter").setup()
  end
}