diff CONTRIBUTORS @ 21578:7cfe51661e98

revert: explicitly get status against the parent This makes absolutely no functional changes. The default value for node1 is already the same as the current value of parent. But to be able to properly use the second parent in merge context, we have to start to be a bit more explicit about what we compute the status against.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 14 May 2014 10:37:25 -0700
parents c29efd272395
children
line wrap: on
line diff