The error message used to only contain the last key of the merge failure this commit changes the message to contain the full path to the merge conflict, resolving ambiguity Change-Id: I9848a559b1b888e50a548eef8609bf34506040de
The error message used to only contain the last key of the merge failure this commit changes the message to contain the full path to the merge conflict, resolving ambiguity Change-Id: I9848a559b1b888e50a548eef8609bf34506040de