Lines Matching defs:merge
163 static bool merge;
204 {"merge", 0, 0, 'm'},
263 merge = true;
305 edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */
306 show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */
307 flagging |= ~incompat & merge;
310 || finalwrite & merge /* -i -m would rewrite input file. */
340 for compatibility, if this is a 3-way diff (not a merge or
343 common = 2 - (edscript | merge);
387 else if (merge)
435 N_("-m --merge Output merged file instead of ed script (default -A)."),