On Apr 12, 2010, at 12:52 PM, D. Richard Hipp wrote:
>
> On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote:
>>
>> It would be interesting to have Fossil automatically use any
>> configured external 3-way merge tool when it's own 3-way merge ends
>> with conflicts, so one can manually and visually solve them, instead
>> of having to go to the sourcefiles. And I thought the gdiff-command
>> setting was meant for that ? Or is that one just for 2-way
>> (graphical)
>> diff viewing ?
>
> "setting gdiff" is for 2-way graphical diff viewing only.
>
> Your idea of only using the 3-way graphical merger when there are
> conflicts is a good one. Tnx
Or would it be sufficient for Fossil to merely retain the three input
files to the merge using some suffix when there is a conflict:
problem.c~BASE
problem.c~OTHER
problem.c~THIS
Fossil would still writes its output (contain the <<<<<<< CONFLICT
marks that people don't like) but the user would be able to manually
invoke whatever graphical 3-way merging tool they want.
>
> Can anyone suggest a good 3-way graphical merger that I can use for
> testing (Mac or Linux).
>
>> Johan
>> _______________________________________________
>> fossil-users mailing list
>> fossil-users@lists.fossil-scm.org
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-
>> users
>
> D. Richard Hipp
> d...@hwaci.com
>
>
>
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
D. Richard Hipp
d...@hwaci.com
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
