Searched refs:show_2nd (Results 1 – 2 of 2) sorted by relevance
186 static int show_2nd; variable290 show_2nd = 1;349 show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */1611 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;1627 if (show_2nd)1739 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;1778 if (show_2nd)1884 show_2nd = 0;
164 static bool show_2nd; variable287 show_2nd = true; in main()350 show_2nd |= !incompat & merge; /* -m without -AeExX3 implies -A. */ in main()1563 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_edscript()1582 if (show_2nd) in output_diff3_edscript()1681 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_merge()1721 if (show_2nd) in output_diff3_merge()