On Mon, Jul 23, 2018 at 09:34:26PM +0200, Herbert J. Skuhra wrote: > > Yes, first you press m. Then you will see differences of installed > file (left) and new file (right). Then you press either l or > r: > > l | 1: choose left diff > r | 2: choose right diff > > If the diff tries to remove/add to many lines you can: > > el: edit left diff > er: edit right diff > > And if done you can view the merged file (v) before installing (i) it. > > I am sure, someone can explain it better! :) >
Perhaps, but you've made the essential point. Your reply let me understand that mergemaster does not really "master" the merge, it rather identifies files needing to be merged and then starts sdiff to let me modify files. Never having even looked at sdiff, the learning curve proved very steep. Too steep, in fact. I'm going to try a more incremental approach. Thank you _very_ much! bob prohaska _______________________________________________ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
