diff options
| author | Modestas Vainius <modestas@vainius.eu> | 2010-07-26 11:24:45 +0300 |
|---|---|---|
| committer | Modestas Vainius <modestas@vainius.eu> | 2010-07-26 11:24:45 +0300 |
| commit | ad64ad4954faad41a5fba44b43849484cd5863be (patch) | |
| tree | ae407c5ce7d7b310c286122cd07b4fe20b1ad177 | |
| parent | d6368b712a283a4763a476c0a40bde7b6cde2f73 (diff) | |
| download | qt4-x11-ad64ad4954faad41a5fba44b43849484cd5863be.tar.gz | |
Use dpkg-mergechangelogs merge driver for the changelog.
| -rw-r--r-- | debian/.gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/.gitattributes b/debian/.gitattributes new file mode 100644 index 0000000..6a03163 --- /dev/null +++ b/debian/.gitattributes @@ -0,0 +1 @@ +changelog merge=dpkg-mergechangelogs |