commit d5aa09296ee17dd3ef20fc07eed18a9708331e5b
author Stephan Herhut <herhut@google.com> Mon May 22 16:06:14 2017 +0200
committer Stephan Herhut <herhut@google.com> Mon May 22 16:06:14 2017 +0200
tree 5c9f40a0889091ac2a06d64cae4b6f22085e01a7
parent 82e83bfe2977f0b1171e994b263f25ceefa6ca1c

Implement simple class merger.

BUG=

Change-Id: Ib22cf7a7d10797b0ba7ed6ef8fb5aa5fda9aaa60

src/test/examples/classmerging/OtherClassWithConflictingMethod.java

diff --git a/src/test/examples/classmerging/OtherClassWithConflictingMethod.java b/src/test/examples/classmerging/OtherClassWithConflictingMethod.java
new file mode 100644
index 0000000..cd7efd1
--- /dev/null
+++ b/src/test/examples/classmerging/OtherClassWithConflictingMethod.java
@@ -0,0 +1,11 @@
+// Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+package classmerging;
+
+public class OtherClassWithConflictingMethod {
+
+  public static int conflict(ConflictingInterfaceImpl item) {
+    return 321;
+  }
+}