Older versions of fossil would provide some very helpful information
from "fossil help set":

gmerge-command   A graphical merge conflict resolver command operating
                 on four files.
              Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output"
              Ex: xxdiff "%original" "%baseline" "%merge" -M "%output"
              Ex: meld "%baseline" "%original" "%merge" "%output"

Having to start up a UI and dig around for these example merge commands
is a bit annoying. I don't know if this was an intentional change but I
would very much like to have the old help information available from
the command line.

Just my $0.02
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to