Revert r1619413. Resolve a text conflict in fs-fs-pack-test.c .

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1619769 13f79535-47bb-0310-9956-ffa450edef68