menu "apply change from left/right" not available

[olek]

I have used keyboard remapping that is build in Mac OS X to map moving between differences and conflict to be same as in FileMerge (it maps new keyboard shortcut to app menu name).

But since actions "apply change from left/right" are available only on toolbar, and not in the menu, I could not customize them to my favorite command + left/right keys.

I do not know if that is an omission that is easy to fix, or a trouble, but it would be nice to have those actions as a menus.

This is no biggie, really, but it would be nice to have it.

[jeffhostetler]

sorry about leaving them out of the menu. i'll log a bug on this.

in the mean time, you can use Contrl+Option+LeftArrow/RightArrow
to apply changes (when the change is highlighted with the dotted
rectangle) and Control+Option+DownArrow/UpArrow to jump between
changes.

hope this helps,
jeff

(if others are reading, these keybindings are for Mac OS X; use
ALT+arrow key on Linux/Windows.)

[olek]

Thank you for quick reply, Jeff.

I noticed those keybindings in the toolbar icon tooltips, but I personally find three-fingered shortcuts too hard on my wrists, I will just use toolbar for now.

BTW - you have used quite nice keybinding on linux (Alt up/down), why not use similar keybindings on mac (Command up/down)?

Honestly, you app feels very nice on mac, it have a 'native' feel to it, except those keybindings... Native mac programs are usually using Command+... keystrokes, control and alt/option keys are reserved for some rare and weird circumstances...

[jeffhostetler]

Thanks!

WRT Command+ keys versus what I have now. There was
something in the MAC keyboard standards that implied that
I shouldn't do that. I don't recall the exact wording (and I'm
not sitting in front of a mac right now), but it was something
like Command+LeftArrow was supposed to move the caret
to the beginning of the line and Option+LeftArrow was supposed
to move the caret to the beginning of the word or previous word.
And Control+LeftArrow was supposed to do something different
(paragraph maybe), but TextEdit violated the standard and did
beginning of line.

So between what the guidelines/standards recommended and
what several popular applications did, I was only left with 2
modifier key combinations....

j

PS. You can also use the right-mouse context menu.

[olek]

I see your point, Jeff. Yes, it is true that Command+arrows keybindings are actively used as standard editing keys, the thing is that I do not care about them that much, but that is just me, scarred vi user

Thank you for the hint with context menu!
And thank you for the best diff tool available! I know what I am talking about, I have used a number of them in the past, but DiffMerge is a true winner... simple, no bloat, intuitive in use and very configurable...

BTW - I am working now on some level of integration between git and diffmerge... looks promising...