Got rid of the rare failure caused by a directory-time mismatch.
authorWayne Davison <wayned@samba.org>
Tue, 14 Dec 2004 19:41:19 +0000 (19:41 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 14 Dec 2004 19:41:19 +0000 (19:41 +0000)
commit4571df58c6447337d564b409a866cad38a85a691
treea94d064514e838bacccc4c7b2aeb73f5454a517f
parentf6b384d41f056dea0ec9a0abe873be078fb09570
Got rid of the rare failure caused by a directory-time mismatch.
testsuite/merge.test