view etc/yow.lines @ 2496:9364da723c1e

(emerge-with-ancestor): Applied Donald Erway's fix patch, which included the following explanatory comment: "D.Erway - This used to just do emerge-get-diff3-group on 2, then on 3. This was incorrect, since the file 3 info for a diff can preceed the file 2 info for that same diff. So we save and restore point to overcome this.

(binary:application/octet-stream)