Use relative directories, and note that the merge code is only
authorWayne Davison <wayned@samba.org>
Sun, 18 Mar 2007 20:41:51 +0000 (20:41 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 18 Mar 2007 20:41:51 +0000 (20:41 +0000)
commit108133689de94aebca29b41cf8f0156fd03123a1
tree194bb866d296eb9bb228f76f32ae3a866b531adb
parent46ad63b7cf559c86e236cc0413e547cec50c5877
Use relative directories, and note that the merge code is only
working because it is not yet using --inc-recursion.
testsuite/merge.test