I recently ran into a merge scenario that most DSCMs seem to fail, but fossil gets right. See the attached fstest.sh for an example.
The question is - is fossil just lucky, or is it looking at the
intermediate revisions in the merge instead of doing a pure 3-way
merge?
Thanks,
<mike
--
Mike Meyer <m...@mired.org> http://www.mired.org/consulting.html
Independent Software developer/SCM consultant, email for more information.
O< ascii ribbon campaign - stop html mail - www.asciiribbon.org
fstest.sh
Description: application/shellscript
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
