search

sindrets / diffview.nvim

Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
Other
3.85k stars 105 forks source link

Keymap to jump to next / previous conflicts #321

Closed avinashsivaraman closed 1 year ago

avinashsivaraman commented 1 year ago

I see that we have diff view actions for jumping to next conflicts. Is there any default keymap to jump to next conflict or is there way to set it?

gegoune commented 1 year ago

Try [x and ]x.

avinashsivaraman commented 1 year ago

Thanks a lot. Is there any place where I can see all the default keymaps?

sindrets commented 1 year ago

https://github.com/sindrets/diffview.nvim/blob/ebcbe90401555272025006db00da0972f7e0db63/doc/diffview_defaults.txt#L94

This is available from :h diffview.defaults within the editor.

I'm kinda confused about how you found the action, seemingly without finding the keymaps that are listed both in the README, and the docs.

Anyway, by default you can also press g? in any diffview window to get an overview of keymaps related to the current context.

avinashsivaraman commented 1 year ago

Thanks.