Le 01/10/2013 11:16, Ivan Voras a écrit : > This is fairly ridiculous. Then, at a random file it has proposed its > own merge and asked the prompt "Does this look reasonable?". It was > not, but when I answered it with "n" it stopped the whole process > (instead of maybe opening the file in the editor for me to merge > again).
You can merge files from freebsd-update, using (m) if I remember well. Then you choose right or left for each step. But there is something strange since you have hundreds of conflicts… Did you built each release from sources? -- Florent Peterschmitt | Please: flor...@peterschmitt.fr | * Avoid HTML/RTF in E-mail. +33 (0)6 64 33 97 92 | * Send PDF for documents. http://florent.peterschmitt.fr | * Trim your quotations. Really. Proudly powered by Open Source | Thank you :)
signature.asc
Description: OpenPGP digital signature
