Support use of Mercurial within a CVS working copy.

diff --git a/.cvsignore b/.cvsignore
index 1595dc4..1b477c7 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 configure autom4te.cache
 bin obj mingw-get.layout mingw-get.depend *.d
+.hg .hgignore

diff --git a/ChangeLog b/ChangeLog
index eaa7c00..9c9d165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-14  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Support use of Mercurial within a CVS working copy.
+
+       * .cvsignore (.hg, .hgignore): Don't have CVS track these.
+
 2011-06-13  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Implement --reinstall option.