The dir vs non-dir test now assumes the dir wins.
authorWayne Davison <wayned@samba.org>
Sun, 13 Feb 2005 22:48:35 +0000 (22:48 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 13 Feb 2005 22:48:35 +0000 (22:48 +0000)
commit24b2096e861c47788a375e81c19e47ae625be722
treedfa6c2eec2d3c05aeb133d074756c6f869e154ab
parent86e97e178de98f6ea9de4200e9c28c10bc03c722
The dir vs non-dir test now assumes the dir wins.
testsuite/merge.test