Manual conflict resolution following CVS merge
[findutils.git] / doc / 
tree7792d6f9a335e81fb45b71486f74bceb5574e946
drwxr-xr-x   ..
-rw-r--r-- 280 .cvsignore
-rw-r--r-- 280 .gitignore
-rw-r--r-- 2603 Makefile.am
-rw-r--r-- 44570 find-maint.texi
-rw-r--r-- 194573 find.texi
-rw-r--r-- 18863 perm.texi