On 2015-03-20 15:56:51, Ron W wrote: > I've never seen a non-gui, interactive merge, so I don't know how feasible > to create such a tool
Have a look at sdiff from e.g. GNU diffutils, invoked with the -o option. Regards, -Martin _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users