tree 7077ad0b9ca6672d7c1fac0c453084cb14459089
parent e9ce3a992ca5627cfa55aa0c5af7c42387c24709
parent 591e39bf9d26d6afc065a2dc8924b469743b60fd
author Shawn Pearce <spearce@spearce.org> 1455580848 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> 1455580850 -0500

Merge "Revert "Fix warnings about unchecked conversion of MergeResult"" into stable-4.2