Fix merging add/remove on same method.
am: 8f27032b2a
* commit '8f27032b2aaf133892562f83314efa39a9c2353c':
Fix merging add/remove on same method.
Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1
diff --git a/src/jdiff/MergeChanges.java b/src/jdiff/MergeChanges.java
index d253ff4..7ef0a84 100755
--- a/src/jdiff/MergeChanges.java
+++ b/src/jdiff/MergeChanges.java
@@ -210,9 +210,10 @@
for (int i = startAdded; i <= endAdded; i++) {
MethodAPI addedMethod2 = (MethodAPI)(classDiff.methodsAdded.get(i));
if (addedMethod2.inheritedFrom_ == null &&
- removedMethod.equalSignatures(addedMethod2))
+ removedMethod.equalSignatures(addedMethod2)) {
addedIdx = i;
break;
+ }
}
if (addedIdx == -1)
return;