Re: [fossil-users] meld-support

2011-03-08 Thread Richard Hipp
On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson jan.m.daniels...@gmail.comwrote: Hello, Anyone here using meld[1]? When merging with many conflicts I find meld to be of invaluable help, though I noticed that meld is missing explicit fossil-support. Is meld more than just a visual

Re: [fossil-users] meld-support

2011-03-08 Thread Richard Hipp
On Tue, Mar 8, 2011 at 1:12 PM, Richard Hipp d...@sqlite.org wrote: On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson jan.m.daniels...@gmail.com wrote: Hello, Anyone here using meld[1]? When merging with many conflicts I find meld to be of invaluable help, though I noticed that meld

Re: [fossil-users] meld-support

2011-03-08 Thread Lluís Batlle i Rossell
On Tue, Mar 08, 2011 at 01:12:22PM -0500, Richard Hipp wrote: On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson jan.m.daniels...@gmail.comwrote: Hello, Anyone here using meld[1]? When merging with many conflicts I find meld to be of invaluable help, though I noticed that meld is

Re: [fossil-users] meld-support

2011-03-08 Thread Lluís Batlle i Rossell
On Tue, Mar 08, 2011 at 01:15:48PM -0500, Richard Hipp wrote: Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? Can meld be plugged into Fossil using the gmerge-command setting? While we're on the subject, should the gmerge-command setting be extended to be

Re: [fossil-users] meld-support

2011-03-08 Thread Jan Danielsson
On 03/08/11 19:12, Richard Hipp wrote: [---] When merging with many conflicts I find meld to be of invaluable help, though I noticed that meld is missing explicit fossil-support. Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? It's mostly a diff/merge-tool (file

Re: [fossil-users] meld-support

2011-03-08 Thread Jan Danielsson
On 03/08/11 19:15, Richard Hipp wrote: [---] While we're on the subject, should the gmerge-command setting be extended to be smart about commonly used graphical merges. Should you be able to say just: fossil setting gmerge-command kdiff3 and fossil would know to add the %baseline

Re: [fossil-users] meld-support

2011-03-08 Thread Bill Whiting
I love meld, but note that fedora 13 14 are currently at v 1.3 Not a problem, but they don't appear to recognize the 4th argument. //Bill On 03/08/2011 02:26 PM, Jan Danielsson wrote: On 03/08/11 19:12, Richard Hipp wrote: [---] When merging with many conflicts I find meld to be of

Re: [fossil-users] meld-support

2011-03-08 Thread Jan Danielsson
On 03/08/11 20:45, Bill Whiting wrote: I love meld, but note that fedora 13 14 are currently at v 1.3 Not a problem, but they don't appear to recognize the 4th argument. Just for the record, in case someone finds this thread through Google or something, as long as you have already the