]> git.lyx.org Git - features.git/commit
projects / features.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2dfb5f8) | patch
Work around bug #9841
authorGuillaume Munch <gm@lyx.org>
Thu, 17 Dec 2015 01:04:25 +0000 (01:04 +0000)
committerGuillaume Munch <gm@lyx.org>
Thu, 17 Dec 2015 20:40:54 +0000 (20:40 +0000)
commitdc016de34eab3fe24d9673a48cabf754bebbadaa
tree5f9b8ed11b39dacd9e336ea7d3c7f6544d0f3350tree | snapshot
parent2dfb5f80ce6500bd8da60a6e170227cc710c818fcommit | diff
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.
src/BufferParams.cpp diff | blob | history
Repository for new features