Skip to content
Snippets Groups Projects
user avatar
Pierre-Yves David authored
We can use the "other" data from the recorded merge state instead of inferring
what the other could be from working copy parent. This will allow resolve to
fulfil its duty even when the second parent have been dropped.

Most direct benefit is fixing a regression in backout.
ba619c50
History
Name Last commit Last update