Got rid of indeterminacy in the overlapping-files.
authorWayne Davison <wayned@samba.org>
Wed, 28 Jan 2004 00:37:55 +0000 (00:37 +0000)
committerWayne Davison <wayned@samba.org>
Wed, 28 Jan 2004 00:37:55 +0000 (00:37 +0000)
commit284d628a7ca583b61a424241fa046856be5842b3
treeee0d6f5b57a0bd11b53f52344018c14d70a1e86c
parentff3184ca1e6afba19d787fd60a355cccedccab88
Got rid of indeterminacy in the overlapping-files.
testsuite/merge.test