if it's of any interest to you: at least with source gear's `DiffMerge'
and fossil settings
gdiff-command (global) diffmerge.sh
gmerge-command (global) diffmerge.sh "%original" "%baseline"
"%merge" --result="%output"
(where `diffmerge.sh' is the provided shell wrapper) everything works just
fine. personally, I find it even nicer than `opendiff' and it's most
useful for 'graphical merge' actions.
joerg
On Wed, 24 Sep 2014 19:54:38 +0200, Dömötör Gulyás <dognot...@gmail.com>
wrote:
Thanks, "fossil diff --tk" works for the interim, but the diffs
provided by FileMerge/opendiff I would prefer. Isn't opendiff the
default gdiff on OS X (or did I just already have it my settings?)? If
it is, i reckon it oughta work :)
On 24 September 2014 19:08, Richard Hipp <d...@sqlite.org> wrote:
On Wed, Sep 24, 2014 at 12:35 PM, Dömötör Gulyás <dognot...@gmail.com>
wrote:
When using fossil gdiff on OS X, with opendiff as the gdiff command,
diffs for all files are shown, even if there are no changes. This
contrasts with behavior of opendiff with git/bzr, etc, which only show
the changed files, which is preferrable.
Is there a known workaround for this? Out of the box, gdiff on OS X
with opendiff is pretty unusable.
I'm not familiar with opendiff. Have you tried instead "fossil diff
--tk"?
Does that work for you?
--
D. Richard Hipp
d...@sqlite.org
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
--
Using Opera's revolutionary email client: http://www.opera.com/mail/
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
