> Additionally, "fossil merge -n | grep" will not find them, because they appear > at stderr.
What about?: fossil merge -n |& grep RR El 10 de febrer de 2012 10:30, Lluís Batlle i Rossell <[email protected]> ha escrit: > Hello, > > I had troubles in a big merge of hundreds of files, where five filse had a > message like this: > fossil: WARNING - no common ancestor: ... > > I did not notice them along the list of files, because the final abstract of > merge conflicts does not include them. > > Additionally, "fossil merge -n | grep" will not find them, because they appear > at stderr. > > I'd prefer those 'no common ancestor' to appear somehow at the final abstract, > maybe counting as merge conflicts. What do you think? > > Now I've to investigate why I have a 'no common ancestor case', because I > think > this should not have happened. > > Regards, > Lluís > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
