Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
- tagging RC_CURRENT
[fs/lustre-release.git]
/
lustre
/
.cvsignore
diff --git
a/lustre/.cvsignore
b/lustre/.cvsignore
index
a8a5356
..
393bc47
100644
(file)
--- a/
lustre/.cvsignore
+++ b/
lustre/.cvsignore
@@
-16,3
+16,4
@@
cscope.out
autom4te-2.53.cache
autom4te.cache
.*.o.cmd
+.mergeinfo