[Midnight Commander] #4163: mcdiff - Merge from left to right with F6

18 views
Skip to first unread message

Ticket System

unread,
Dec 26, 2020, 9:41:08 PM12/26/20
to be...@gensis.com.br, mc-...@googlegroups.com
#4163: mcdiff - Merge from left to right with F6
--------------------------------+-----------------------------------
Reporter: kroggen | Type: enhancement
Status: new | Priority: major
Milestone: Future Releases | Component: mcdiff
Version: master | Keywords:
Blocked By: | Blocking:
Branch state: no branch | Votes for changeset:
--------------------------------+-----------------------------------
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!

--
Ticket URL: <http://www.midnight-commander.org/ticket/4163>
Midnight Commander <https://midnight-commander.org>
Midnight Development Center

Ticket System

unread,
Dec 27, 2020, 4:32:22 AM12/27/20
to be...@gensis.com.br, mc-...@googlegroups.com
#4163: mcdiff - Merge from left to right with F6
----------------------------+------------------------------
Reporter: kroggen | Owner:
Type: enhancement | Status: closed
Priority: major | Milestone:
Component: mcdiff | Version: master
Resolution: invalid | Keywords:

Blocked By: | Blocking:
Branch state: no branch | Votes for changeset:
----------------------------+------------------------------
Changes (by andrew_b):

* status: new => closed
* resolution: => invalid
* milestone: Future Releases =>


Comment:

Replying to [ticket:4163 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.

--
Ticket URL: <http://www.midnight-commander.org/ticket/4163#comment:1>

Ticket System

unread,
Jan 15, 2021, 3:17:15 PM1/15/21
to be...@gensis.com.br, mc-...@googlegroups.com
#4163: mcdiff - Merge from left to right with F6
----------------------------+------------------------------
Reporter: kroggen | Owner:
Type: enhancement | Status: closed
Priority: major | Milestone:
Component: mcdiff | Version: master
Resolution: invalid | Keywords:

Blocked By: | Blocking:
Branch state: no branch | Votes for changeset:
----------------------------+------------------------------

Comment (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...

--
Ticket URL: <http://www.midnight-commander.org/ticket/4163#comment:2>

Ticket System

unread,
Jan 15, 2021, 11:23:17 PM1/15/21
to be...@gensis.com.br, mc-...@googlegroups.com
#4163: mcdiff - Merge from left to right with F6
----------------------------+------------------------------
Reporter: kroggen | Owner:
Type: enhancement | Status: closed
Priority: major | Milestone:
Component: mcdiff | Version: master
Resolution: invalid | Keywords:

Blocked By: | Blocking:
Branch state: no branch | Votes for changeset:
----------------------------+------------------------------

Comment (by andrew_b):

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

--
Ticket URL: <http://www.midnight-commander.org/ticket/4163#comment:3>

Ticket System

unread,
Jan 15, 2021, 11:29:35 PM1/15/21
to be...@gensis.com.br, mc-...@googlegroups.com
#4163: mcdiff - Merge from left to right with F6
----------------------------+------------------------------
Reporter: kroggen | Owner:
Type: enhancement | Status: closed
Priority: major | Milestone:
Component: mcdiff | Version: master
Resolution: invalid | Keywords:

Blocked By: | Blocking:
Branch state: no branch | Votes for changeset:
----------------------------+------------------------------

Comment (by kroggen):

Sure! =)

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

--
Ticket URL: <http://www.midnight-commander.org/ticket/4163#comment:4>

Reply all
Reply to author
Forward
0 new messages