was_tracked 681 merge-recursive.c return !was_tracked(path) && file_exists(path); was_tracked 1420 merge-recursive.c renamed_stage == 2 || !was_tracked(ren1_src)); was_tracked 1663 merge-recursive.c int file_from_stage2 = was_tracked(path);