Thank you for the follow-up.
Yes, the problem is definitely fixed now
Search found 12 matches
- Thu Apr 09, 2009 10:27 am
- Forum: Support (DiffMerge)
- Topic: running diffmerge.sh on OS X runs app behing all others
- Replies: 6
- Views: 10007
- Fri Apr 18, 2008 10:28 am
- Forum: Support (DiffMerge)
- Topic: diffing with /dev/null works from UI, but breaks in console
- Replies: 7
- Views: 14791
Thank you for the reference, Jeff. This might be a way to go for some people, but I would prefer the workflow where I can manually merge conflicted changes AFTER merging branches, not in the process. That would allow, for example to see that merging produces too many conflicts and scrap it altogethe...
- Thu Apr 17, 2008 1:45 pm
- Forum: Support (DiffMerge)
- Topic: diffing with /dev/null works from UI, but breaks in console
- Replies: 7
- Views: 14791
Re: How odd.
PS. let me know how your git integration goes and if i can do anything else to help. Jeff, how difficult is it going to be to add feature that is similar to what tkdiff does with "tkdiff -conflict filename"? The fact is, git does not have any hooks that would allow to execute diffmerge wh...
- Thu Apr 17, 2008 1:35 pm
- Forum: Support (DiffMerge)
- Topic: diffing with /dev/null works from UI, but breaks in console
- Replies: 7
- Views: 14791
What you recommend, Jeff, is precisely what I ended up doing yesterday :) Here is my script: #!/bin/sh # Author: Olek Poplavsky # Script name: diffmerge-git-wrapper # This script works as interface bridge between git and DiffMerge and allows to get nice visual # diffs from git; right now script requ...
- Wed Apr 16, 2008 12:04 pm
- Forum: Support (DiffMerge)
- Topic: diffing with /dev/null works from UI, but breaks in console
- Replies: 7
- Views: 14791
diffing with /dev/null works from UI, but breaks in console
Of course, nobody in their right mind would compare anything with /dev/null, but when diffmerge is integrated into source control system, sometimes (often) situation arrives when diffmerge is executed for a new file that have no prior versions. In that case git is passing /dev/null instead of file n...
- Tue Apr 15, 2008 6:59 pm
- Forum: Support (DiffMerge)
- Topic: menu "apply change from left/right" not available
- Replies: 4
- Views: 6198
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! ...
- Tue Apr 15, 2008 1:34 pm
- Forum: Support (DiffMerge)
- Topic: menu "apply change from left/right" not available
- Replies: 4
- Views: 6198
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 (...
- Tue Apr 15, 2008 10:36 am
- Forum: Support (DiffMerge)
- Topic: menu "apply change from left/right" not available
- Replies: 4
- Views: 6198
menu "apply change from left/right" not available
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 ...
- Tue Apr 15, 2008 10:13 am
- Forum: Support (DiffMerge)
- Topic: running diffmerge.sh on OS X runs app behing all others
- Replies: 6
- Views: 10007
Well, I found a problem with that script that makes it not usable for me. That solution runs diffmerge in a spawned process, and that means that 'diffmerge' script has become non-blocking. While this would not be a problem for casual user, this makes it impossible to integrate it with subversion bec...
- Thu Apr 10, 2008 3:20 pm
- Forum: Support (DiffMerge)
- Topic: diffmerge and subversion integration
- Replies: 1
- Views: 6748
diffmerge and subversion integration
Here is my solution for integration between diffmerge and subversion. I created a wrapper script that provides command line interface that subversion expects, and converts it to diffmerge command line, with some nice additions. As a starting point for this script I used somebody's else script that w...
- Thu Apr 10, 2008 12:02 pm
- Forum: Support (DiffMerge)
- Topic: running diffmerge.sh on OS X runs app behing all others
- Replies: 6
- Views: 10007
Thank you. While this fix seems to be a bit like band-aid :) it works indeed. Since majority of my use for diffmerge is driven by svn, chances of invalid command line args are very slim. BTW - I have created nice shell script that wraps diffmerge in such a way that it is nice and convenient to use i...
- Thu Apr 10, 2008 9:44 am
- Forum: Support (DiffMerge)
- Topic: running diffmerge.sh on OS X runs app behing all others
- Replies: 6
- Views: 10007
running diffmerge.sh on OS X runs app behing all others
Hi First of all - thank you for wonderful tool. I really got used to it on linux, but when I tried to use it on mac, I found a problem which makes in very inconvenient to use DiffMerge. If I run diffmerge by activating its app icon, or using quicksilver, it start correctly, and I immediately see its...