| /freebsd-10.3-release/gnu/usr.bin/rcs/merge/ |
| H A D | Makefile | 1 PROG= merge
2 SRCS= merge.c
|
| H A D | merge.c | 0 /* merge - three-way file merge */
34 "\nmerge: usage: merge [-AeEpqxX3] [-L lab [-L lab [-L lab]]] file1 file2 file3";
44 mainProg(mergeId, "merge", "$FreeBSD: releng/10.3/gnu/usr.bin/rcs/merge/merge.c 50472 1999-08-27 23:37:10Z peter $")
101 exitmain(merge(tostdout, edarg, label, arg));
|
| /freebsd-10.3-release/bin/setfacl/ |
| H A D | Makefile | 4 SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
|
| /freebsd-10.3-release/gnu/usr.bin/rcs/ |
| H A D | Makefile | 4 ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
|
| /freebsd-10.3-release/etc/periodic/daily/ |
| H A D | 310.accounting | 52 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-10.3-release/contrib/gperf/src/ |
| H A D | keyword-list.cc | 87 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-10.3-release/contrib/nvi/docs/USD.doc/vi.ref/ |
| H A D | Makefile | 26 sort -u '-t ' +0 -1 +1n | awk -f merge.awk | \
|
| /freebsd-10.3-release/contrib/ofed/management/ |
| H A D | gen_chlog.sh | 38 base=`git merge-base $obj HEAD`
|
| /freebsd-10.3-release/cddl/usr.bin/ctfconvert/ |
| H A D | Makefile | 19 merge.c \
|
| /freebsd-10.3-release/cddl/usr.bin/ctfmerge/ |
| H A D | Makefile | 17 merge.c \
|
| /freebsd-10.3-release/contrib/jemalloc/ |
| H A D | FREEBSD-upgrade | 20 # ./FREEBSD-upgrade merge-changes
56 work="${src}/../${workname}" # merge-changes expects ${workname} in "..".
89 merge-changes) # Merge local changes that were made since the previous import.
|
| /freebsd-10.3-release/share/doc/usd/13.viref/ |
| H A D | Makefile | 30 sort -u '-t ' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \
|
| /freebsd-10.3-release/usr.bin/svn/lib/libsvn_client/ |
| H A D | Makefile | 14 info.c iprops.c list.c locking_commands.c log.c merge.c \
|
| /freebsd-10.3-release/usr.bin/svn/lib/libsvn_ra_serf/ |
| H A D | Makefile | 12 inherited_props.c locks.c log.c merge.c mergeinfo.c options.c \
|
| /freebsd-10.3-release/usr.bin/svn/lib/libsvn_wc/ |
| H A D | Makefile | 13 diff_local.c entries.c externals.c info.c lock.c merge.c \
|
| /freebsd-10.3-release/crypto/openssl/crypto/engine/ |
| H A D | eng_dyn.c | 438 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s); local
439 if (!merge)
441 if (DSO_load(ctx->dynamic_dso, merge, NULL, 0)) {
443 OPENSSL_free(merge);
446 OPENSSL_free(merge);
|
| /freebsd-10.3-release/usr.sbin/freebsd-update/ |
| H A D | freebsd-update.sh | 2315 # From the list of "old" files in $1, merge changes in $2 with those in $3,
2324 rm -rf merge/
2327 mkdir -p merge/old/${D}
2328 mkdir -p merge/${OLDRELNUM}/${D}
2329 mkdir -p merge/${RELNUM}/${D}
2330 mkdir -p merge/new/${D}
2337 gunzip < files/${V}.gz > merge/old/${F}
2343 > merge/${OLDRELNUM}/${F}
2351 > merge/${RELNUM}/${F}
2355 # Attempt to automatically merge change
[all...] |
| /freebsd-10.3-release/usr.bin/svn/svn/ |
| H A D | Makefile | 14 file-merge.c help-cmd.c import-cmd.c info-cmd.c list-cmd.c \
15 lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \
|
| /freebsd-10.3-release/contrib/ntp/sntp/unity/auto/ |
| H A D | generate_test_runner.rb | 17 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-10.3-release/gnu/usr.bin/rcs/lib/ |
| H A D | merger.c | 1 /* 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-10.3-release/sbin/ldconfig/ |
| H A D | ldconfig.c | 74 static int merge; variable
151 merge = 1;
173 argv + optind, merge || rescan);
180 if (justread || merge || rescan) {
185 if (!nostd && !merge && !rescan)
|
| /freebsd-10.3-release/contrib/ncurses/ncurses/base/ |
| H A D | lib_mouse.c | 7 * 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-10.3-release/contrib/llvm/tools/clang/include/clang/Basic/ |
| H A D | Visibility.h | 128 void merge(LinkageInfo other) { function in class:clang::LinkageInfo
133 /// Merge linkage and conditionally merge visibility.
|
| /freebsd-10.3-release/contrib/libstdc++/include/backward/ |
| H A D | algo.h | 107 using std::merge;
|
| /freebsd-10.3-release/contrib/groff/src/preproc/refer/ |
| H A D | ref.h | 94 void merge(reference &);
|