summaryrefslogtreecommitdiff
path: root/test/integration/test-implicit-conflicts-real-not-virtual
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-17 16:14:03 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-17 16:14:03 +0200
commitb0fa553969d4eefc5fc401ac6c2ccaedb5afcc3d (patch)
treef0c3876663f6af4fb9b52f0b5c49a3a7bd314847 /test/integration/test-implicit-conflicts-real-not-virtual
parente64b6489e6617ba497301a4522ba3e40edf04acb (diff)
import framework and disable not-relevant tests
Diffstat (limited to 'test/integration/test-implicit-conflicts-real-not-virtual')
0 files changed, 0 insertions, 0 deletions