tree aa41da6eecef422fdbb5107ad0d953bb595fd961
parent a51f44edb068daa96d3908dc8bfef77a7568aafe
parent ad96546ca023c260ed7250c447f4c8abe168afd3
author Chris Aniszczyk <caniszczyk@gmail.com> 1291732465 -0500
committer Code Review <codereview-daemon@eclipse.org> 1291732465 -0500

Merge "Rebase Interoperability third part: handle stop upon conflict"