summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2008-07-22 20:18:42 -0400
committerDoug Ledford <dledford@redhat.com>2008-07-22 20:18:42 -0400
commit5cff617547e594b2990a7cb80b0c50f0e6ae847c (patch)
tree7f788c015abb10aa4f1176e601e829e76c1bf82a
parent2e578d92057260ab9f180c4d8866c0fcd6586a1f (diff)
downloadcommon-5cff617547e594b2990a7cb80b0c50f0e6ae847c.tar.gz
common-5cff617547e594b2990a7cb80b0c50f0e6ae847c.tar.xz
common-5cff617547e594b2990a7cb80b0c50f0e6ae847c.zip
Don't pay attention to cvs diff/conflict files
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1c3ccd8..bc70a31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
CVS/
.cvsignore
-cvs-import.sh
+.#*