Skip to content
Snippets Groups Projects
Commit 303cbfe3 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

merge: infer the "other" changeset when falling back to v1 format

When we have to fallback to the old version of the file, we infer the
"other" from current working directory parent. The same way it is currently done
in the resolve command. This is know to have shortcoming… but we cannot do
better from the data contained in the old file format. This is actually the
motivation to add this new file format.
parent 02c60e38
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment