On May 17, 2016, at 12:25 PM, Ron W <ronw.m...@gmail.com> wrote: > > So far, none of the IDEs I've used seem to support VCS merges from within the > IDE.
Visual Studio does, with Git: https://www.visualstudio.com/en-us/get-started/code/merging-with-squash _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
