| commit | f3613f5bb58f5cfccb0221143381ffd2f67791f0 | |
| author | Eric S. Raymond <esr@snark.thyrsus.com> | |
| Fri, 9 Apr 1993 23:17:05 +0000 (9 23:17 +0000) | ||
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | |
| Fri, 9 Apr 1993 23:17:05 +0000 (9 23:17 +0000) | ||
| tree | f54ebf9a29612f184ea66fe3d9847d5e016440e5 | treesnapshot (tar.gz zip) |
| parent | f449890c0caa599894092956a25302a336715fc8 | commitdiff |
(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.
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.
| lisp/emerge.el | diffblobblamehistory |