maemo.org - Talk - View Single Post - [Fremantle Maemo5+Harmattan Maemo6] Midnight Commander

	joerg_rw	2014-04-23 , 19:54
	Posts: 2,222 \| Thanked: 12,651 times \| Joined on Mar 2010 @ SOL 3	#95

Originally Posted by szopin

4.8.10 on jolla, merge works fine it seems (compared two similar files, one with extra line, after merge it got added to the other and asked if to save changes on exit)

Well, when I try to "merge" two quite different files, it simply replaces one side with the other side. It doesn't ask what to merge, nor does it take sections from both files. Maybe my idea of what's "merge" is flawed. Maybe my test been flawed. Whatever, it works same way on PC and fremantle. So no bug. There are a few flaws in MC (all platforms), like hexedit not available from F4-edit, you need to F3-display the file, then switch from there to "hex" view, then "edit file". Prolly about F5-merge it's similarly tricky

[edit]
https://www.midnight-commander.org/wiki/NEWS-4.8.5

Diff viewer
Bidirectional merge (F5 merge left-to-right, F15 - merge right-to-left) (#2863)

https://www.midnight-commander.org/ticket/2863

mcdiffviewer can merge only from right panel to left panel file.
It will be nice, if -- similar to edit and edit other -- mcdiffviewer can merge hunks into the opposite directions too.
This patch add this feature to mcdiffviewer. With F15 mcdiffviewer merge left panel to right panel direction.

__________________
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member

EX Hildon Foundation approved Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/

IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N

Last edited by joerg_rw; 2014-04-23 at 20:29.

Quote & Reply |

The Following 2 Users Say Thank You to joerg_rw For This Useful Post:
handaxe, szopin