diff options
| author | Andre Weinand | 2001-07-11 09:20:28 +0000 |
|---|---|---|
| committer | Andre Weinand | 2001-07-11 09:20:28 +0000 |
| commit | 391df7d566489be46554f1ae09414b2f71c80ebe (patch) | |
| tree | f13d200a4ac39fa651cb0d0c2492dc96838d6501 | |
| parent | b412aa447637b6325146b88b526a3a99a53a8b4c (diff) | |
| download | eclipse.platform.team-391df7d566489be46554f1ae09414b2f71c80ebe.tar.gz eclipse.platform.team-391df7d566489be46554f1ae09414b2f71c80ebe.tar.xz eclipse.platform.team-391df7d566489be46554f1ae09414b2f71c80ebe.zip | |
PR 1GF0UT6
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java index 3ff40b115..fb585e18d 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java @@ -338,7 +338,7 @@ public class DocumentRangeNode // no destination: we have to add the contents into the parent
add(srcContents, null /*srcParentNode*/, src);
}
- return null;
+ return child;
}
/* (non Javadoc)
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java index 3ff40b115..fb585e18d 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java @@ -338,7 +338,7 @@ public class DocumentRangeNode // no destination: we have to add the contents into the parent
add(srcContents, null /*srcParentNode*/, src);
}
- return null;
+ return child;
}
/* (non Javadoc)
|