From 4fb777db005e9ea1db4908033447d049a818ed2f Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 13 Feb 2004 17:59:21 +0000
Subject: [PATCH] Ignore all .mergeinfo files.

---
 lustre/.cvsignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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