On 27 Feb 2006, at 22:15, Chris Friesen wrote:
On Feb 27, 2006, at 8:58 AM, David Dolinar wrote:
2) To apply a diff from one side to another FileMerge uses a popup button control for which there's no keyboard shortcut. This is needlessly tedious - it should have a button and a menu item so you don't have to wear out your fingers clicking and dragging when you want to apply a thousand changes in a merge.
I find CW or TextWrangler much safer and faster for file merging than FileMerge because of these two reasons. They're not huge things to fix though and I'd happily switch to FileMerge if they were.
I don't have much of an answer for your first complaint. However you should know that there indeed are keyboard shortcuts. Try using the down & up arrows to move between differences, and the left and right arrow to 'choose' which version you want.
You can do them all at once too. Cmd-a to select all the diffs, then use the right or left arrow to choose all right or left.
Well, this has been a useful thread. It started with a complaint and everything's now solved without anyone having to write any code. Just out of interest, though. Is all this stuff documented anywhere or have you all been experimenting or peeking in the app?
Jerry
|
