merged_tree: don't add empty subtree to parent, remove canceling terms prior to resolving file-level conflict#2662

Merged

yuja merged 2 commits intojj-vcs:mainfrom yuja:push-rvzkrrtpmozx

Dec 2, 2023

+69-8

Commits on Dec 2, 2023

merged_tree: do not propagate conflicting empty tree value to parent
yuja
committed
merged_tree: remove canceling terms prior to resolving file-level conflict
yuja
committed