merge-recursive: Split was_tracked() out of would_lose_untracked()