merge-recursive: clarify code in was_tracked()