Re: Tool suggestion for Frescobaldi

Could you use git? Or are you looking to have this integrated? For me, I just open a command shell and do the diff/merge there. Frescobaldi knows when a file has changed underneath it and asks you if you want to reload it.

Knute Snortum

(via Gmail)

On Tue, May 6, 2014 at 1:23 AM, Jacques Menu <address@hidden> wrote:

Hello folks,

A diff/merge utility could be nice to have in the Tools menu.

In the case of Mac OS X, provided XCode (free from the App Store) is installed, /usr/bin/opendiff launches FileMerge or connects to the running instance if any. FileMerge has a nice interface.

Hope this helps!

JM

PS1> To have FileMerge (XCode 5.x) in the Applications folder:

cd /Applications

ln -s /Applications/Xcode.app/Contents/Applications/FileMerge.app .

PS2> You can then drag the FileMerge icon to the Dock

_______________________________________________
lilypond-user mailing list
address@hidden
https://lists.gnu.org/mailman/listinfo/lilypond-user

From:	Knute Snortum
Subject:	Re: Tool suggestion for Frescobaldi
Date:	Tue, 6 May 2014 06:59:02 -0700