From 8812e0b82500c823b60f9e0fe53027f0928318dd Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 9 Jun 2013 17:10:58 -0700
Subject: 31466: Cause git and cvs to ignore one another, in case anyone wants
 to import this tree into a CVS repository.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 87a64b835..0bf13d2a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-09  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 31466: .cvsignore, .gitignore: Cause git and cvs to ignore
+	one another.
+
 2013-06-01  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31441: Src/glob.c, Src/pattern.c, Src/zsh.h: use an array
-- 
cgit 1.4.1