`<leader>c` keymaps not working for `jj`

[pksunkara]

For both jj and git, when using this as merge tool, I would like to have a shortcut (keymap) to quickly select ours and theirs directly instead of manually resolving the conflicts.

And it should also work when one of the side has deleted the file.

[dlyongemallo]

Just to clarify: are you saying that the <leader>c keymaps don't work for you when you are inside a merge marker? Or are you asking for a feature where you choose an entire side's contents outside of any marker blocks?

[pksunkara]

Okay, so the <leader>c keymaps were not showing up in help panel, so I didn't know they exist and thus created this issue. So, one of the request here is to make them show up in help panel (I was trying in MERGED).

---

But the keymaps are also not working for jj repos (with & without preferred_adapter = jj).

---

I have tested the keymaps with git and it's working. But I have a question, what does \cB supposed to do? Should it be setting merged to the base file entirely? Or does it also take the common diff from ours and theis and apply it to base?

I am seeing an empty file. Maybe it's because the scenario I am trying has the base file containing a single line a which is deleted in both ours and theirs.

[dlyongemallo]

But I have a question, what does \cB supposed to do? Should it be setting merged to the base file entirely? Or does it also take the common diff from ours and theis and apply it to base?

Neither. <leader>cB (conflict_choose_all("base')), like other <leader>c* commands, operate on marker blocks. All it does is replace the conflict region in the merged buffer with the content of the region's BASE block, as a whole.

If you have git's merge.conflictStyle = merge (the default), then your BASE block will be empty. If you have a setting which leaves the BASE non-empty (e.g., merge.conflictStyle = zdiff3), then <leader>cB will insert that content.

(I think you can get something similar with jj config set --user merge-tools.diffview.conflict-marker-style = 'git-diff', assuming merge-tools.diffview is the id used in your config.)

[pksunkara]

Everything works, but your docs about conflict-marker-style being git-diff is wrong. It should be git. Fix that and this can be closed.

[dlyongemallo]

Thanks for pointing that out.