Guillaume Munch wrote: > commit dc016de34eab3fe24d9673a48cabf754bebbadaa > Author: Guillaume Munch <g...@lyx.org> > Date: Thu Dec 17 01:04:25 2015 +0000 > > Work around bug #9841 > > \output_changes is now output at a distance from \tracking_changes. > > Since both parameters can be seen as per-user preferences, they can > cause undesirable merge conflicts, in a multi-author setting, were it > treated as a single block by the version control system, as was the > case before this patch. >
Unfortunately we have a regression now: Both tex2lyx and lyx2lyx output these parameters in a different order than LyX. Also, lyx2lyx might rely on the old order for backward conversion. Did you check that it still works? Georg
