Can i use `gs_status_use_base_version` and `gs_status_use_commit_version` in case of merge conflicts in diff view?

[shubham-dogra-s1]

Currently these commands only work in status view. I need to go back and forth. It would be great if we can do the same from diff view as well

[kaste]

Sorry for the late reply.

Yeah, that would be great!

If you tackle this, in commands/diff.py:

diff = SplittedDiff.from_view(self.view)
if diff.is_combined_diff():  

E.g. diff.py:958 has probably most of the logic. What might be tricky is to get the undo command right. But maybe not and you get that with a quick search plus thinking.