oh, this is how I would get the file at the second merge if I do a merge FROM root-of-rel_3_0 instead that from merged-rel_3_0_1
<<<<<<< file3.txt newdev patch patch newdev numero 3 patch newdev patch newdev SECONDO NEW DEV SECONDO NEW DEV ======= secondaPatch patch patch numero 3 patch patch secondaPatch secondaPatch >>>>>>> 1.1.1.1.2.3 (sorry for the name, I wrote file.txt in the post instead of file3.txt but it's the same file!) Now this contains everything, but I have to resolve the first merge again! I just ask why it would discard new dev lines at beginning for example. thank you again _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
