Re: [fossil-users] Merge tool

2012-08-30 Thread Peter Spjuth
On Thu, Aug 30, 2012 at 11:28 AM, Baruch Burstein wrote: > So, basically it is 3 questions: > 1) Does TortoiseMerge not work with fossil (maybe it sends the command line > parameters wrong?) You probably need the correct settings for TortoiseMerge, which I don't know. These examples from other me

Re: [fossil-users] Merge tool

2012-08-30 Thread Richard Hipp
On Thu, Aug 30, 2012 at 5:28 AM, Baruch Burstein wrote: > Can someone help me understand the conflict-resolving procedure. This is > what happens: > > I have a private branch. I merge the trunk into it: > fossil update my-branch > fossil merge trunk > I then get a warning about 3 merge conflic

[fossil-users] Merge tool

2012-08-30 Thread Baruch Burstein
Can someone help me understand the conflict-resolving procedure. This is what happens: I have a private branch. I merge the trunk into it: fossil update my-branch fossil merge trunk I then get a warning about 3 merge conflicts. I go to those files and see I have 4(!) of each. A baseline, orign