I suspect that in this case "a proper merge" will consist of removing
95% of changes made w.r.t. the reference (my) implementation.
If that's the right thing to do, then let's do it. However, we have
to find the other 5% (or whatever fraction it is) and keep them--we
can't throw them away without checking. Also, we'll need change log
entries for the changes, starting from our current version.
If you want to do this work, that would be ideal, but our changes do
need to be look at one by one, not discarded en masse.
The easiest way to look at them is to diff our current version against
a suitable old version. I will do that for you if you want.
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
