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
+2 -2
View File
@@ -14,9 +14,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 0
xfsrestore: session label: "stress_056"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: searching media for directory dump
xfsrestore: reading directories
xfsrestore: 7 directories and 11 entries processed