Dear all, if I understand it correctly, when merging files fossil tries to use its own algorithm (the src/merge3.c/blob_merge() function) as good as it can, and attempts to fall back to an external merge tool (defined by gmerge-command) if it is not happy with the result.
For our workflows, it would be interesting to have the ability to always use the external merge tool in place of the blob_merge(). We use Fossil for collaborative research paper writing and its a good thing to see what changes other people did when trying to push your own. I have seen in the description of the merge_3way() function that there are plans to introduce a new merge-command setting which would do exactly what I need it to do. The change required for this seems quite trivial, but as I don’t know how to add new settings to fossil or how to properly ‘panic’, I can’t submit a patch for this feature. Maybe someone more competent could have a quick glance? Of course, I can trivially modify the merge_3way() function so that is always attempts to run gmerge-command first, but I really would like to avoid building a custom fossil version for our internal use… Thank you! -- Taras
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
