mirror of
https://https.git.savannah.gnu.org/git/automake.git
synced 2026-01-27 01:44:19 +00:00
018a186636
The use of the "union" merge driver to avoid conflicts in NEWS has proven to be problematic, as it often silently produced mis-merges (instead of spurious conflicts, but a spurious conflict is better than a mis-merge). Also, our new branching policy (see automake bug#11153 for a description) should greatly mitigate the problem of merge conflicts in NEWS. For further discussion, see: <http://lists.gnu.org/archive/html/automake-patches/2012-04/msg00148.html> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
2 lines
21 B
Plaintext
2 lines
21 B
Plaintext
*.texi* diff=texinfo
|