diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-26 17:47:14 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-26 17:47:14 +0200 |
| commit | 018a186636ba4078496f56a945d25087bca127a3 (patch) | |
| tree | 7188309477a6c7f5f3998e7b1cc6dfdc1449214b /.gitattributes | |
| parent | ab14841acb906346345c9298ef50621d298f4a28 (diff) | |
| download | automake-018a186636ba4078496f56a945d25087bca127a3.tar.gz | |
maint: don't use "union" merge driver for NEWS anymore
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>
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 5126add6d..0d86adb5e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -NEWS merge=union *.texi* diff=texinfo |