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

123456

/freebsd-11-stable/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-11-stable/gnu/usr.bin/rcs/
H A DMakefile4 ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
/freebsd-11-stable/usr.bin/pr/tests/
H A Dbasic2_test.sh36 atf_test_case merge
41 atf_check -s ignore -o file:$(atf_get_srcdir)/merge.out \
57 atf_add_test_case merge
H A DMakefile11 ${PACKAGE}FILES+= merge.out
/freebsd-11-stable/bin/setfacl/
H A DMakefile5 SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
/freebsd-11-stable/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-11-stable/contrib/jemalloc/include/jemalloc/
H A Djemalloc_typedefs.h56 chunk_merge_t *merge; member in struct:__anon1802
/freebsd-11-stable/contrib/llvm-project/lld/lib/ReaderWriter/MachO/
H A DAtoms.h30 ContentType type, Merge merge, bool thumb, bool noDeadStrip,
33 _align(align), _contentType(type), _scope(scope), _merge(merge),
57 Merge merge() const override { return _merge; }
90 Scope scope, ContentType type, Merge merge,
94 : MachODefinedAtom(f, name, scope, type, merge, thumb, noDeadStrip,
122 Merge merge() const override { return DefinedAtom::mergeAsTentative; }
29 MachODefinedAtom(const File &f, const StringRef name, Scope scope, ContentType type, Merge merge, bool thumb, bool noDeadStrip, const ArrayRef<uint8_t> content, Alignment align) argument
89 MachODefinedCustomSectionAtom(const File &f, const StringRef name, Scope scope, ContentType type, Merge merge, bool thumb, bool noDeadStrip, const ArrayRef<uint8_t> content, StringRef sectionName, Alignment align) argument
/freebsd-11-stable/contrib/llvm-project/llvm/include/llvm/WindowsManifest/
H A DWindowsManifestMerger.h13 // merging several of these .manifest files using a tree-merge following
16 // Microsoft Manifest Tool (mt.exe) revealed the rules of this merge. As the
52 Error merge(const MemoryBuffer &Manifest);
/freebsd-11-stable/contrib/llvm-project/llvm/tools/llvm-cov/
H A DCoverageSummaryInfo.cpp66 Summary.RegionCoverage.merge(FCS.RegionCoverage);
67 Summary.LineCoverage.merge(FCS.LineCoverage);
H A DCoverageSummaryInfo.h44 void merge(const RegionCoverageInfo &RHS) { function in class:llvm::RegionCoverageInfo
85 void merge(const LineCoverageInfo &RHS) { function in class:llvm::LineCoverageInfo
/freebsd-11-stable/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-11-stable/contrib/libpcap/
H A Dpcap-snf.c354 int ret, allports = 0, merge = 0; local
371 merge = strtol(nr, NULL, 0);
377 merge = merge & SNF_F_AGGREGATE_PORTMASK;
412 merge ? "Merge Bitmask Port " : "",
413 merge ? 1 << ifa->snf_ifa_portnum : ifa->snf_ifa_portnum);
417 if (merge)
483 if (merge) {
/freebsd-11-stable/share/doc/usd/13.viref/
H A DMakefile32 sort -u '-t ' -k 1,1 -k 2n | awk -f ${.CURDIR}/merge.awk | \
/freebsd-11-stable/cddl/usr.bin/ctfconvert/
H A DMakefile19 merge.c \
/freebsd-11-stable/cddl/usr.bin/ctfmerge/
H A DMakefile17 merge.c \
/freebsd-11-stable/contrib/llvm-project/lld/COFF/
H A DWriter.h46 void merge(OutputSection *other);
/freebsd-11-stable/contrib/llvm-project/lld/lib/Core/
H A DSymbolTable.cpp40 assert(atom.merge() != DefinedAtom::mergeByContent);
44 if (atom.merge() == DefinedAtom::mergeByContent) {
140 switch (mergeSelect(existingDef->merge(), newDef->merge())) {
/freebsd-11-stable/usr.bin/svn/lib/libsvn_wc/
H A DMakefile27 merge.c \
/freebsd-11-stable/usr.bin/svn/lib/libsvn_ra_serf/
H A DMakefile25 merge.c \
/freebsd-11-stable/crypto/openssl/crypto/engine/
H A Deng_dyn.c440 char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s); local
441 if (!merge)
443 if (DSO_load(ctx->dynamic_dso, merge, NULL, 0)) {
445 OPENSSL_free(merge);
448 OPENSSL_free(merge);
/freebsd-11-stable/contrib/llvm-project/llvm/include/llvm/ADT/
H A Dsimple_ilist.h257 void merge(simple_ilist &RHS) { merge(RHS, std::less<T>()); } function in class:llvm::simple_ilist
258 template <class Compare> void merge(simple_ilist &RHS, Compare comp);
270 void simple_ilist<T, Options...>::merge(simple_ilist &RHS, Compare comp) { function in class:llvm::simple_ilist
306 // Sort the sublists and merge back together.
309 merge(RHS, comp);
/freebsd-11-stable/contrib/llvm-project/llvm/lib/Target/AMDGPU/
H A DSIModeRegister.cpp51 // merge two status values such that only values that don't conflict are
53 Status merge(const Status &S) const { function in struct:Status
57 // merge an unknown value by using the unknown value's mask to remove bits
214 // of the Mode register we merge the modes
272 NewInfo->Change = NewInfo->Change.merge(Setreg);
299 NewInfo->Change = NewInfo->Change.merge(InstrMode);
305 NewInfo->Change = NewInfo->Change.merge(InstrMode);
345 Status TmpStatus = BlockInfo[ThisBlock]->Pred.merge(BlockInfo[ThisBlock]->Change);
/freebsd-11-stable/usr.sbin/freebsd-update/
H A Dfreebsd-update.sh2370 # From the list of "old" files in $1, merge changes in $2 with those in $3,
2379 rm -rf merge/
2382 mkdir -p merge/old/${D}
2383 mkdir -p merge/${OLDRELNUM}/${D}
2384 mkdir -p merge/${RELNUM}/${D}
2385 mkdir -p merge/new/${D}
2392 gunzip < files/${V}.gz > merge/old/${F}
2398 > merge/${OLDRELNUM}/${F}
2406 > merge/${RELNUM}/${F}
2410 # Attempt to automatically merge change
[all...]

Completed in 208 milliseconds

123456