Surlignage Mark Triggs <[EMAIL PROTECTED]>: > Matthieu MOY <[EMAIL PROTECTED]> writes: > > > Surlignage Mark Triggs <[EMAIL PROTECTED]>: > > > >> Does anyone have any special tricks for merging in upstream patches that > >> contain some of your own changes? > > > > --three-way, implemented in xtla.el > > --forward, not yet implemented by us if my memory's good. You can add it > with a > > few lines of lisp ! > > '--forward' is exactly what I was after--I can't believe I missed this > :o) > > I'll certainly add this to xtla.
Please do ! > Would it be reasonable to add a > variable like `tla-use-forward-option' that caused commands like > star-merge, replay, update etc. to use the --forward option? Look at what was done for --three-way, and do the same ;-) -- Matthieu ------------------------------------------------- envoyé via Webmail/IMAG !
