Searched refs:merge (Results 1 - 25 of 67) sorted by relevance

123

/freebsd-9.3-release/gnu/usr.bin/rcs/merge/
H A DMakefile1 PROG= merge
2 SRCS= merge.c
H A Dmerge.c0 /* merge - three-way file merge */
34 "\nmerge: usage: merge [-AeEpqxX3] [-L lab [-L lab [-L lab]]] file1 file2 file3";
44 mainProg(mergeId, "merge", "$FreeBSD$")
101 exitmain(merge(tostdout, edarg, label, arg));
/freebsd-9.3-release/bin/setfacl/
H A DMakefile4 SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
/freebsd-9.3-release/gnu/usr.bin/rcs/
H A DMakefile1 SUBDIR= lib ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
/freebsd-9.3-release/etc/periodic/daily/
H A D310.accounting52 rm -f acct.merge && cp acct.0 acct.merge || rc=3
53 sa -s $daily_accounting_flags /var/account/acct.merge || rc=3
54 rm acct.merge
/freebsd-9.3-release/contrib/gperf/src/
H A Dkeyword-list.cc87 merge (Keyword_List *list1, Keyword_List *list2, Keyword_Comparison less) function
151 /* Sort the two halves, then merge them. */
152 return merge (mergesort_list (list, less),
/freebsd-9.3-release/cddl/usr.bin/ctfconvert/
H A DMakefile19 merge.c \
/freebsd-9.3-release/cddl/usr.bin/ctfmerge/
H A DMakefile17 merge.c \
/freebsd-9.3-release/contrib/nvi/docs/USD.doc/vi.ref/
H A DMakefile26 sort -u '-t ' +0 -1 +1n | awk -f merge.awk | \
/freebsd-9.3-release/contrib/ofed/management/
H A Dgen_chlog.sh38 base=`git merge-base $obj HEAD`
/freebsd-9.3-release/share/doc/usd/13.viref/
H A DMakefile30 sort -u '-t ' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \
/freebsd-9.3-release/crypto/openssl/crypto/engine/
H A Deng_dyn.c442 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s); local
443 if (!merge)
445 if (DSO_load(ctx->dynamic_dso, merge, NULL, 0)) {
447 OPENSSL_free(merge);
450 OPENSSL_free(merge);
/freebsd-9.3-release/usr.sbin/freebsd-update/
H A Dfreebsd-update.sh2294 # From the list of "old" files in $1, merge changes in $2 with those in $3,
2303 rm -rf merge/
2306 mkdir -p merge/old/${D}
2307 mkdir -p merge/${OLDRELNUM}/${D}
2308 mkdir -p merge/${RELNUM}/${D}
2309 mkdir -p merge/new/${D}
2316 gunzip < files/${V}.gz > merge/old/${F}
2322 > merge/${OLDRELNUM}/${F}
2330 > merge/${RELNUM}/${F}
2334 # Attempt to automatically merge change
[all...]
/freebsd-9.3-release/gnu/usr.bin/rcs/lib/
H A Dmerger.c1 /* three-way file merge internals */
55 merge(tostdout, edarg, label, argv) function
61 * Do `merge [-p] EDARG -L l0 -L l1 -L l2 a0 a1 a2',
100 warn("conflicts during merge");
131 warn("overlaps or other problems during merge");
/freebsd-9.3-release/contrib/ntp/sntp/unity/auto/
H A Dgenerate_test_runner.rb17 when String then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
18 when Hash then @options.merge!(options)
42 options.merge!(yaml_guts[:unity] || yaml_guts[:cmock])
54 @options.merge!(options) unless options.nil?
/freebsd-9.3-release/sbin/ldconfig/
H A Dldconfig.c74 static int merge; variable
144 merge = 1;
166 argv + optind, merge || rescan);
173 if (justread || merge || rescan) {
178 if (!nostd && !merge && !rescan)
H A Delfhints.c232 update_elf_hints(const char *hintsfile, int argc, char **argv, int merge) argument
236 if (merge)
/freebsd-9.3-release/contrib/ncurses/ncurses/base/
H A Dlib_mouse.c7 * without limitation the rights to use, copy, modify, merge, publish, *
1009 bool merge; local
1052 _trace_slot(sp, "before mouse press/release merge:");
1060 /* first pass; merge press/release pairs */
1062 merge = FALSE;
1083 merge = TRUE;
1086 if (merge)
1091 (merge);
1095 _trace_slot(sp, "before mouse click merge:");
1104 * Second pass; merge clic
[all...]
/freebsd-9.3-release/contrib/groff/src/preproc/refer/
H A Dref.h94 void merge(reference &);
/freebsd-9.3-release/contrib/groff/src/roff/troff/
H A Dmtsm.h101 void merge(statem *, statem *);
/freebsd-9.3-release/contrib/libstdc++/include/backward/
H A Dalgo.h107 using std::merge;
/freebsd-9.3-release/contrib/llvm/tools/clang/include/clang/Basic/
H A DVisibility.h128 void merge(LinkageInfo other) { function in class:clang::LinkageInfo
133 /// Merge linkage and conditionally merge visibility.
/freebsd-9.3-release/gnu/usr.bin/binutils/libbfd/
H A DMakefile33 merge.c \
/freebsd-9.3-release/gnu/usr.bin/rcs/rcsmerge/
H A Drcsmerge.c76 * Add -q. Pass -L options to merge.
79 * Propagate merge's exit status.
266 status = merge(tostdout, edarg, xrev, arg);
/freebsd-9.3-release/usr.bin/pr/
H A Dpr.c97 int merge; /* merge multiple files in output */ variable
130 if (merge)
825 * of the merge operation (-m) in relation to unsuccesful file opens
1676 ++merge;
1744 if (merge) {
1747 merge = 0;
1758 if (merge) {
1769 if (cflag || merge) {
1780 if (merge) {
[all...]

Completed in 412 milliseconds

123