On Fri, Oct 9, 2015 at 1:57 PM, Warren Young <[email protected]> wrote: > On Oct 9, 2015, at 11:56 AM, Warren Young <[email protected]> wrote: >> >> Why can’t you just ask f diff -r 1c708ccc8f ? That tells you whether you >> need to do the merge or not. > > Never mind. For that to do what you want, diff would need a --cherrypick > option, too.
maybe use the -n (--dry-run) option to merge? _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
