tree 4ee72ed6cef94e3ee73518c10613deb4769d538e
parent 855d5a173f08d17aed62bed61209c429eba78883
author Saša Živkov <sasa.zivkov@sap.com> 1444739818 +0200
committer Saša Živkov <sasa.zivkov@sap.com> 1444820239 +0200

Fix "Conflicts With" when other change is a merge-commit

The "Conflicts With" list often didn't consider the merge-commit changes
because the list of changed files for a merge commit consists of only
those files which had a conflict during that merge and we only
considered those changes with overlapping file-set as potential conflict
candidates.

Check for all open merge-commit changes if they will conflict with the
current change. This fix is reasonable as the number of merge-commits in
review is usually low.

Note that this only fixes the case when a candidate for the "Conflicts
With" list is a merge commit. The case when the current change, on which
the "Conflicts With" is computed, is a merge commit requires a different
fix.

Bug: issue 3052
Change-Id: I137497fe1bbe262406e693cfd5fdec2ad4a67722