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

Change-Id: Iaceecb26062266ccd9a1c63c126ff0d5471f7d97
Merge "(bug 56184) Allow 3-way merge from arbitrary revisions"