Hi, I've another question. I've set up a repository to use a graphical merge tool (setting gmerge-command).
Now if I want to check which files will have a conflict when merging. I thought that the --nochange option of 'fossil merge' is the right tool. But if I execute 'fossil merge --nochange' the graphical merge tool is called (the same happens with 'fossil update --nochange'). I would prefer that in the case of a dryrun the graphical tool is *not* called but only the conflicts are shown in the terminal. Is there a way to achieve this? Thanks, Frank _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
