Ignore all .mergeinfo files.

author adilger <adilger>

Fri, 13 Feb 2004 17:59:21 +0000 (17:59 +0000)

committer adilger <adilger>

Fri, 13 Feb 2004 17:59:21 +0000 (17:59 +0000)
author adilger <adilger>
Fri, 13 Feb 2004 17:59:21 +0000 (17:59 +0000)
committer adilger <adilger>
Fri, 13 Feb 2004 17:59:21 +0000 (17:59 +0000)
diff --git a/lustre/.cvsignore b/lustre/.cvsignore

index 393bc47..94df924 100644 (file)
--- a/lustre/.cvsignore
+++ b/lustre/.cvsignore
@@ -16,4 +16,4 @@ cscope.out
  autom4te-2.53.cache
  autom4te.cache
  .*.o.cmd
-.mergeinfo
+.mergeinfo*