Merge "(bug 56184) Allow 3-way merge from arbitrary revisions"