Hi!
Was looking through src/diffviewer/ydiff.c and noticed a typo, it seems -- in
the source code, Merge command is described as doing a merge from the right
panel to the left one (and MergeOther from the right panel to the left one):
case CK_Merge:
do_merge_hunk (dview, FROM_LEFT_TO_RIGHT);
dview_redo (dview);
break;
case CK_MergeOther:
do_merge_hunk (dview, FROM_RIGHT_TO_LEFT);
dview_redo (dview);
break;
While in reality Merge inserts hunks from the right panel to the left one (and
MergeOther from the left panel to the right one). Am I missing something here?
Also, while on topic, would it be possible to add some sort of 'undo' command
here? To revert changes done by the Merge/MergeOther commands? Seems like it
can be a very handy feature.
Thanks :)
--
JD
_______________________________________________
mc mailing list
https://mail.gnome.org/mailman/listinfo/mc
