kc3-lang/automake

• Browse

  Commit

• Author : Stefano Lattarini
  Date : 2012-02-14 13:21:26
  Hash : f874f9ee
  Message : gitattributes: use "union" merge driver for NEWS This should help in reducing the spurious merge conflicts for the NEWS file, which have already caused a great deal of confusion and wasted time. Suggestion by Eric Blake: http://lists.gnu.org/archive/html/automake-patches/2012-02/msg00119.html * .gitattributes (NEWS): Use the "union" merge driver.