merge-recursive: fix check for skipability of working tree updates