Hi folks, I use fossil for some LabView development (among other dev work). For those not familiar with it, it's a graphical programming environment, and the files are binary. That in itself isn't a big deal. Especially because we're provided with a merge tool. I've tested out the merge command I pass I set up in fossil (for gmerge):
lvmerge "%baseline" "%original" "%merge" "%output" However, when I go to merge two branches, fossil just says "***** Cannot merge binary file Measurements/Resistance/DC/Get Resistance.vi" without launching the merge tool. I guess the question is, does fossil even attempt to launch the gmerge tool when merging binary files? Thanks, Tomek
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
