On Dec 11, 2017, at 3:09 PM, Rolf Ade <fos...@pointsman.de> wrote: > > Florian Balmer writes: >> I didn't want to spend my hobby time with CSS >> diffing. > > ...having own > skins and CSS as branch of the main trunk(s) (the build-in skins) and to > be able to merge the own skins/CSS from the build-in skins, as they > development …
Try: $ fossil conf export skin foo …upgrade Fossil, switch repo to skin you wish to merge… $ fossil conf merge foo I haven’t tested it, but it looks like it should work. See “fossil help conf” for more on this. If it works, it might be nice to have a shortcut: $ fossil conf merge skin If given an AREA argument instead of a FILENAME, it should roll you back to the parent skin and then merge the changes using the same mechanism it currently allows for diffing your current skin against the parent skin. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
