svn commit: r287682 - in user/dim: merge-test merge-test2

[Dimitry Andric]

Author: dim
Date: Fri Sep 11 17:24:19 2015
New Revision: 287682
URL: https://svnweb.freebsd.org/changeset/base/287682

Log:
  Get rid of the merge tests again.

Deleted:
  user/dim/merge-test/
  user/dim/merge-test2/