diff --git a/lua/diffs/merge.lua b/lua/diffs/merge.lua
index 9bb9d68..ed75093 100644
--- a/lua/diffs/merge.lua
+++ b/lua/diffs/merge.lua
@@ -298,6 +298,7 @@ function M.goto_next(bufnr)
     end
   end
 
+  vim.notify('[diffs.nvim]: wrapped to first hunk', vim.log.levels.INFO)
   vim.api.nvim_win_set_cursor(0, { candidates[1].start_line + 1, 0 })
 end
 
@@ -335,6 +336,7 @@ function M.goto_prev(bufnr)
     end
   end
 
+  vim.notify('[diffs.nvim]: wrapped to last hunk', vim.log.levels.INFO)
   vim.api.nvim_win_set_cursor(0, { candidates[#candidates].start_line + 1, 0 })
 end
 
diff --git a/spec/merge_spec.lua b/spec/merge_spec.lua
index 2f788a6..2037ee9 100644
--- a/spec/merge_spec.lua
+++ b/spec/merge_spec.lua
@@ -508,6 +508,44 @@ describe('merge', function()
       helpers.delete_buffer(w_bufnr)
     end)
 
+    it('goto_next notifies on wrap-around', function()
+      local working_path = '/tmp/diffs_test_wrap_notify.lua'
+      local w_bufnr = create_working_buffer({
+        '<<<<<<< HEAD',
+        'local x = 1',
+        '=======',
+        'local x = 2',
+        '>>>>>>> feature',
+      }, working_path)
+
+      local d_bufnr = create_diff_buffer({
+        'diff --git a/file.lua b/file.lua',
+        '--- a/file.lua',
+        '+++ b/file.lua',
+        '@@ -1,1 +1,1 @@',
+        '-local x = 1',
+        '+local x = 2',
+      }, working_path)
+      vim.api.nvim_set_current_buf(d_bufnr)
+      vim.api.nvim_win_set_cursor(0, { 6, 0 })
+
+      local notified = false
+      local orig_notify = vim.notify
+      vim.notify = function(msg)
+        if msg:match('wrapped to first hunk') then
+          notified = true
+        end
+      end
+
+      merge.goto_next(d_bufnr)
+      vim.notify = orig_notify
+
+      assert.is_true(notified)
+
+      helpers.delete_buffer(d_bufnr)
+      helpers.delete_buffer(w_bufnr)
+    end)
+
     it('goto_prev jumps to previous conflict hunk', function()
       local working_path = '/tmp/diffs_test_prev.lua'
       local w_bufnr = create_working_buffer({
@@ -576,6 +614,44 @@ describe('merge', function()
       helpers.delete_buffer(w_bufnr)
     end)
 
+    it('goto_prev notifies on wrap-around', function()
+      local working_path = '/tmp/diffs_test_prev_wrap_notify.lua'
+      local w_bufnr = create_working_buffer({
+        '<<<<<<< HEAD',
+        'local x = 1',
+        '=======',
+        'local x = 2',
+        '>>>>>>> feature',
+      }, working_path)
+
+      local d_bufnr = create_diff_buffer({
+        'diff --git a/file.lua b/file.lua',
+        '--- a/file.lua',
+        '+++ b/file.lua',
+        '@@ -1,1 +1,1 @@',
+        '-local x = 1',
+        '+local x = 2',
+      }, working_path)
+      vim.api.nvim_set_current_buf(d_bufnr)
+      vim.api.nvim_win_set_cursor(0, { 1, 0 })
+
+      local notified = false
+      local orig_notify = vim.notify
+      vim.notify = function(msg)
+        if msg:match('wrapped to last hunk') then
+          notified = true
+        end
+      end
+
+      merge.goto_prev(d_bufnr)
+      vim.notify = orig_notify
+
+      assert.is_true(notified)
+
+      helpers.delete_buffer(d_bufnr)
+      helpers.delete_buffer(w_bufnr)
+    end)
+
     it('skips resolved hunks', function()
       local working_path = '/tmp/diffs_test_skip_resolved.lua'
       local w_bufnr = create_working_buffer({