Re: Changes to emacs-23 branch and the trunk

[Chong Yidong]

Kenichi Handa <address@hidden> writes:

> I'm going to fix the display-table related problem in
> emacs-23 branch.  But, the diff of the change will conflict
> with the trunk code.  As I'm afraid that it's not a simple
> work to resolve that confliction, I want to apply the same
> change to the trunk code by myself.  Can I do that?  What
> should I take care other than the usual committing of
> changes?

If different changes have to be applied to the different branches, just
make the changes directly.