Ticket #4163 (closed enhancement: invalid)

Opened 18 months ago

Last modified 18 months ago

mcdiff - Merge from left to right with F6

Reported by: kroggen Owned by:
Priority: major Milestone:
Component: mcdiff Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: no branch Votes for changeset:

Description

Hello!

Thanks for the great tool! I use it a lot.

If we could merge the selected diff/change from the left file to the right file using eg F6, it would be great!

We already are able to merge to the left with F5.

Consider also using GitHub? or GitLab? for issues, so we don't need to create an account here.

Thanks in advance!

Change History

comment:1 in reply to: ↑ description Changed 18 months ago by andrew_b

  • Status changed from new to closed
  • Resolution set to invalid
  • Milestone Future Releases deleted

Replying to kroggen:

If we could merge the selected diff/change from the left file to the right file using eg F6, it would be great!

You can use Shift-F5.

We already are able to merge to the left with F5.

mc.keymap, section [diffviewer]:

Merge = f5
MergeOther = f15

Consider also using GitHub? or GitLab? for issues, so we don't need to create an account here.

No.

comment:2 Changed 18 months ago by kroggen

I did not know we could change the config. I was able to change it to F6. Unhappily it does not appear in the menu below on the 6 placeholder.

Anyway, I left here the suggestion to change from F15 to F6 and display this on the screen menu, so people will know this just by looking at the menu, and also F15 does not work properly on Mac terminals...

comment:3 Changed 18 months ago by andrew_b

Yes, F15 is not documented in the help. But who does read help?

comment:4 Changed 18 months ago by kroggen

Sure! =)

Just correcting myself: by "menu below" I meant the toolbar at the bottom.

Note: See TracTickets for help on using tickets.