[SCM] Packaging of KVIrc (formerly maintained in Hg) branch, squeeze, updated. upstream/4.0.2-11-gae976c5

[Kai Wasserbäch]

The following commit has been merged in the squeeze branch:
commit 9940d9dd4cd2e01dd8e603f731e724446860fe7d
Author: Kai Wasserbäch <curan at debian.org>
Date:   Wed Mar 9 12:47:50 2011 +0100

    Add .gitattributes for three-way merge of debian/changelog
---
 .gitattributes        |    1 +
 .gitignore            |    1 +
 debian/.gitattributes |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..67739a9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.gitattributes   export-ignore
diff --git a/.gitignore b/.gitignore
index 07eda4a..d444c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
 .*
 !.gitignore
+!.gitattributes
 !.svnrevision
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

-- 
Packaging of KVIrc (formerly maintained in Hg)