Comment 5 for bug 1625876

Reviewed: https://review.openstack.org/380088
Committed: https://git.openstack.org/cgit/openstack/git-upstream/commit/?id=47092a9b63185ed50119bd6d510c5843a3c57d86
Submitter: Jenkins
Branch: master

commit 47092a9b63185ed50119bd6d510c5843a3c57d86
Author: Darragh Bailey <email address hidden>
Date: Fri Sep 30 11:09:31 2016 +0100

    Fix finish merge to ensure correct contents

    Make sure to use the same variable for all git commands in the finish
    phase as this has already been set to the correct branch or sha1
    depending on whether the currently in a rebase or not.

    In certain cases the finish steps were not using the correct references
    to merge and read-tree resulting in the final merge containing the
    wrong tree contents.

    Add test to cover the conflict and manual resolve case, as well as
    adding a check to the other tests for testing the resulting merge
    contains the correct contents.

    Change-Id: I2fb870ad685b7ca2543c896bb2af4410a32373d0
    Closes-Bug: #1625876