Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+3 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 065
# FS QA Test No. 065
#
# Testing incremental dumps and cumulative restores with
# "adding, deleting, renaming, linking, and unlinking files and
@@ -54,7 +54,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.filter
. ./common.dump
_my_ls_filter()
{
#
@@ -75,6 +74,8 @@ _my_ls_filter()
}
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
#
# too much hassle to get output matching with quotas turned on