From: adilger <adilger>
Date: Fri, 13 Feb 2004 17:59:21 +0000 (+0000)
Subject: Ignore all .mergeinfo files.
X-Git-Tag: 1.2.0~78
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4fb777db005e9ea1db4908033447d049a818ed2f;p=fs%2Flustre-release.git

Ignore all .mergeinfo files.
---

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*