Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 25 of 105) sorted by relevance

12345

/mirbsd/src/sbin/wsconsctl/
Dutil.c278 rd_field(struct field *f, char *val, int merge) in rd_field() argument
290 if (merge) in rd_field()
298 if (merge) in rd_field()
316 if (merge == '+') in rd_field()
318 else if (merge == '-') in rd_field()
349 if (! merge) in rd_field()
353 if (merge) { in rd_field()
/mirbsd/src/lib/libncurses/src/ncurses/base/
Dlib_mouse.c954 bool merge; in _nc_mouse_parse() local
1007 merge = FALSE; in _nc_mouse_parse()
1028 merge = TRUE; in _nc_mouse_parse()
1031 if (merge) in _nc_mouse_parse()
1036 (merge); in _nc_mouse_parse()
1067 merge = FALSE; in _nc_mouse_parse()
1084 merge = TRUE; in _nc_mouse_parse()
1087 if (merge) in _nc_mouse_parse()
1099 merge = TRUE; in _nc_mouse_parse()
1102 if (merge) in _nc_mouse_parse()
[all …]
/mirbsd/src/usr.bin/vi/docs/USD.doc/vi.ref/
DMakefile6 EXTRA= merge.awk spell.ok
21 sort -u '-t ' +0 -1 +1n | awk -f merge.awk | \
/mirbsd/src/libexec/ld.so/ldconfig/
Dldconfig.c70 int merge; variable
119 merge = 1; in main()
145 if (unconfig && merge) in main()
151 if (justread || merge || rescan) { in main()
165 if (rescan || unconfig || merge || justread || nostd || doprebind) in main()
Dprebind_struct.h78 extern int merge;
/mirbsd/src/usr.bin/pr/
Dpr.c127 int merge; /* merge multiple files in output */ variable
159 if (merge) in main()
1826 ++merge; in setup()
1887 if (merge) { in setup()
1891 merge = 0; in setup()
1902 if (merge) { in setup()
1913 if (cflag || merge) { in setup()
1924 if (merge) { in setup()
/mirbsd/src/gnu/usr.bin/cvs/diff/
Ddiff3.c195 static int merge; variable
308 merge = 1;
350 edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */
351 show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */
352 flagging |= ~incompat & merge;
355 || finalwrite & merge /* -i -m would rewrite input file. */
388 if (edscript || merge )
484 else if (merge)
1890 merge = 0;
/mirbsd/src/usr.bin/sort/
Dmsort.c120 merge(MAXFCT-1-16, last, get, tout, put, ftbl); in fmerge()
124 merge(files.top+j, last, get, tout, put, ftbl); in fmerge()
141 merge(int infl0, int nfiles, in merge() function
Dextern.h56 void merge(int, int,
/mirbsd/src/gnu/usr.bin/rcs/merge/
DMakefile3 PROG= merge
/mirbsd/src/usr.sbin/httpd/src/main/
Dutil_script.c419 table *merge; in ap_scan_script_header_err_core() local
430 merge = ap_make_table(r->pool, 10); in ap_scan_script_header_err_core()
485 ap_overlap_tables(r->err_headers_out, merge, in ap_scan_script_header_err_core()
568 ap_table_add(merge, w, l); in ap_scan_script_header_err_core()
/mirbsd/src/gnu/usr.bin/rcs/
DMakefile8 PROGS+= merge
/mirbsd/src/gnu/usr.bin/rcs/src/
Dmerge.c104 return merge(tostdout, edarg, label, arg); in main()
Dmerger.c58 merge(tostdout, edarg, label, argv) in merge() function
Drcsmerge.c271 status = merge(tostdout, edarg, xrev, arg); in main()
/mirbsd/src/gnu/usr.bin/cvs/
DFAQ234 unless they switch to your branch or explicitly merge your branch into
390 - Plan when to merge it back into the main line of development.
394 - If you ever intend to merge branches into each other, instead of
413 If you plan to split from the "main line" and merge back after a time,
430 merge ever done. Good Luck.
434 6. How do I merge a whole branch back into the trunk?
436 If you don't have a working directory, you can checkout and merge in
464 7. How do I merge changes from the trunk into my branch or between
471 The way to merge *all* changes made on the trunk into a working
477 Then merge the changes from the trunk into your working branch using
[all …]
/mirbsd/src/gnu/usr.bin/perl/Porting/
Dtestall.atom82 prof -pixie -merge new.Counts -L. -incobj libperl.so perl t/perl.Counts all.Counts
/mirbsd/src/usr.bin/diff3/
Ddiff3prog.c143 void merge(int, int);
201 merge(m, n); in main()
302 merge(int m1, int m2) in merge() function
/mirbsd/src/sys/isofs/cd9660/
DTODO.hibler5 Since it was modelled after the inode code, we might be able to merge
/mirbsd/src/lib/libexpat/
DCOPYING8 without limitation the rights to use, copy, modify, merge, publish,
/mirbsd/src/usr.sbin/httpd/src/support/
Dapxs.pl777 NULL, /* merge per-dir config structures */
779 NULL, /* merge per-server config structures */
/mirbsd/src/lib/libncurses/src/include/
Dunctrl.h.in7 * without limitation the rights to use, copy, modify, merge, publish, *
Dtermcap.h.in7 * without limitation the rights to use, copy, modify, merge, publish, *
/mirbsd/src/distrib/common/
Dfunctions10 # merge, give away, or sublicence.
/mirbsd/src/distrib/baselive/i386/
Drc.netselect10 # merge, give away, or sublicence.

12345