tree f081dbbaf0f2900d10ef8f2de83fd089934d463d
parent 17e4fa9748bec3cf8d58011479da7697d494ba05
author James E. Blair <jeblair@redhat.com> 1486505052 -0800
committer Clint Byrum <clint@fewbar.com> 1486668267 -0800

Split merger and launcher git roots

In case a user runs a merger and a launcher on the same host, make
sure that they don't share a git directory (used by the launcher's
internal merger).  They could end up colliding.

Incidentally, that's basically the configuraton used in tests, so
update the test configuration likewise.

Change-Id: I64a690c706d00583973bd2d542a5f42ae6e9ef36