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

12

/haiku-fatelf/src/bin/coreutils/man/
H A Dpaste.x2 paste \- merge lines of files
/haiku-fatelf/src/bin/rcs/
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", "$Id: merge.c 3476 2003-06-11 15:56:10Z darkwyrm $")
101 exitmain(merge(tostdout, edarg, label, arg));
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");
H A Drcsmerge.c80 * Add -q. Pass -L options to merge.
83 * Propagate merge's exit status.
270 status = merge(tostdout, edarg, xrev, arg);
H A Drcsbase.h69 * Add support for merge -A vs -E, and allow up to three labels.
448 /* merge */
449 int merge P((int,char const*,char const*const[3],char const*const[3]));
/haiku-fatelf/src/bin/network/wget/src/
H A Durl.c1738 char *merge;
1761 merge = xmalloc (baselength + linklength + 1);
1762 memcpy (merge, base, baselength);
1763 memcpy (merge + baselength, link, linklength);
1764 merge[baselength + linklength] = '\0';
1777 merge = xmalloc (baselength + linklength + 1);
1778 memcpy (merge, base, baselength);
1779 memcpy (merge + baselength, link, linklength);
1780 merge[baselength + linklength] = '\0';
1807 merge
1730 char *merge; local
[all...]
/haiku-fatelf/src/add-ons/kernel/drivers/graphics/common/
H A Dmemory_manager.c53 /** merge "block" with successor */
56 merge(mem_info *mem, mem_block *block) function
71 /** free memory block including merge */
83 merge(mem, prev);
89 merge(mem, block);
/haiku-fatelf/src/libs/ncurses/ncurses/base/
H A Dlib_mouse.c7 * without limitation the rights to use, copy, modify, merge, publish, *
954 bool merge; local
997 _trace_slot("before mouse press/release merge:");
1005 /* first pass; merge press/release pairs */
1007 merge = FALSE;
1028 merge = TRUE;
1031 if (merge)
1036 (merge);
1040 _trace_slot("before mouse click merge:");
1049 * Second pass; merge clic
[all...]
/haiku-fatelf/src/bin/coreutils/
H A Dbootstrap377 # See if we can use gnulib's git-merge-changelog merge driver.
379 if git config merge.merge-changelog.driver >/dev/null ; then
381 elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
382 echo "initializing git-merge-changelog driver"
383 git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
384 git config merge
[all...]
/haiku-fatelf/data/etc/bash_completion.d/
H A Dgit232 if [ -f "$g/rebase-merge/interactive" ]; then
234 b="$(cat "$g/rebase-merge/head-name")"
235 elif [ -d "$g/rebase-merge" ]; then
237 b="$(cat "$g/rebase-merge/head-name")"
646 git merge -s help 2>&1 |
657 # 'git merge -s help' (and thus detection of the merge strategy
878 fmt-merge-msg) : plumbing;;
891 merge-*) : plumbing;;
1198 __gitcomp "diff3 merge" "" "
[all...]
/haiku-fatelf/headers/cpp/
H A Dalgo.h78 using __STD::merge;
H A Dstl_list.h500 void merge(list& __x);
507 template <class _StrictWeakOrdering> void merge(list&, _StrictWeakOrdering);
692 void list<_Tp, _Alloc>::merge(list<_Tp, _Alloc>& __x) function in class:list
738 __counter[__i].merge(__carry);
746 __counter[__i].merge(__counter[__i-1]);
783 void list<_Tp, _Alloc>::merge(list<_Tp, _Alloc>& __x, function in class:list
814 __counter[__i].merge(__carry, __comp);
822 __counter[__i].merge(__counter[__i-1], __comp);
H A Dstl_slist.h666 void merge(slist& __x);
677 void merge(slist&, _StrictWeakOrdering);
818 void slist<_Tp,_Alloc>::merge(slist<_Tp,_Alloc>& __x) function in class:slist
844 __counter[__i].merge(__carry);
854 __counter[__i].merge(__counter[__i-1]);
890 void slist<_Tp,_Alloc>::merge(slist<_Tp,_Alloc>& __x, function in class:slist
917 __counter[__i].merge(__carry, __comp);
927 __counter[__i].merge(__counter[__i-1], __comp);
H A Dstl_algo.h1378 __result = merge(__first, __first + __step_size,
1385 merge(__first, __first + __step_size, __first + __step_size, __last,
1398 __result = merge(__first, __first + __step_size,
1406 merge(__first, __first + __step_size,
1938 // merge, with and without an explicitly supplied comparison function.
1941 _OutputIter merge(_InputIter1 __first1, _InputIter1 __last1, function
1960 _OutputIter merge(_InputIter1 __first1, _InputIter1 __last1, function
2142 merge(__buffer, __buffer_end, __middle, __last, __first);
2185 merge(__buffer, __buffer_end, __middle, __last, __first, __comp);
/haiku-fatelf/src/apps/showimage/
H A DShowImageView.h124 void _GetMergeRects(BBitmap* merge,
131 void _MergeWithBitmap(BBitmap* merge,
H A DShowImageView.cpp1027 ShowImageView::_GetMergeRects(BBitmap* merge, BRect selection, BRect& srcRect, argument
1038 srcRect = merge->Bounds().OffsetToCopy(B_ORIGIN);
1057 ShowImageView::_MergeWithBitmap(BBitmap* merge, BRect selection) argument
1072 _GetMergeRects(merge, selection, srcRect, dstRect);
1073 view.DrawBitmap(merge, srcRect, dstRect);
/haiku-fatelf/headers/private/net/
H A Dnet_buffer.h51 status_t (*merge)(net_buffer* buffer, net_buffer* with, bool after); member in struct:net_buffer_module_info
/haiku-fatelf/src/add-ons/kernel/bluetooth/hci/
H A Dacl.cpp131 gBufferModule->merge(conn->currentRxPacket, nbuf, true);
/haiku-fatelf/src/bin/diffutils/src/
H A Ddiff3.c181 static bool merge;
221 {"merge", 0, 0, 'm'},
283 merge = 1;
323 edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */
324 show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */
325 flagging |= ~incompat & merge;
328 || finalwrite & merge /* -i -m would rewrite input file. */
358 for compatibility, if this is a 3-way diff (not a merge or
361 common = 2 - (edscript | merge);
402 else if (merge)
179 static bool merge; variable
[all...]
/haiku-fatelf/src/add-ons/kernel/network/protocols/l2cap/
H A Dl2cap_command.cpp229 // TODO: given data can be freed... merge does it?
231 gBufferModule->merge(_m, _data, true);
266 gBufferModule->merge(_m, _data, true);
/haiku-fatelf/src/add-ons/kernel/network/protocols/ipv4/
H A Dipv4.cpp317 // Now try if we can already merge the fragments together
328 status_t status = gBufferModule->merge(buffer, previous, false);
329 TRACE(" merge previous: %s", strerror(status));
355 status_t status = gBufferModule->merge(buffer, next, true);
356 TRACE(" merge next: %s", strerror(status));
378 // We couldn't merge the fragments, so we need to add it as is
416 status = gBufferModule->merge(fragment, buffer, false);
419 status = gBufferModule->merge(buffer, fragment, true);
/haiku-fatelf/src/bin/gdb/gdb/
H A Dgdb-events.sh88 If editing this file, please also run gdb-events.sh and merge any
/haiku-fatelf/src/add-ons/kernel/network/protocols/ipv6/
H A Dipv6.cpp358 // Now try if we can already merge the fragments together
369 status_t status = gBufferModule->merge(buffer, previous, false);
370 TRACE(" merge previous: %s", strerror(status));
396 status_t status = gBufferModule->merge(buffer, next, true);
397 TRACE(" merge next: %s", strerror(status));
419 // We couldn't merge the fragments, so we need to add it as is
457 status = gBufferModule->merge(fragment, buffer, false);
460 status = gBufferModule->merge(buffer, fragment, true);
/haiku-fatelf/src/bin/gawk/
H A Darray.c892 /* merge --- do a merge of two sorted lists */
895 merge(NODE *left, NODE *right) function
954 /* merge the two sorted parts of the list */
955 return merge(left, right);
1081 * (The especially nice thing about using a merge sort here is that
/haiku-fatelf/src/bin/coreutils/src/
H A Dsort.c234 /* During the merge phase, the number of files to merge at once. */
237 /* Minimum size for a merge or check buffer. */
243 /* The number of bytes needed for a merge or check buffer, which can
293 /* Maximum number of files to merge in one go. If more than this
365 --batch-size=NMERGE merge at most NMERGE inputs at once;\n\
380 -m, --merge merge already sorted files; do not sort\n\
450 {"merge", no_argument, NULL, 'm'},
2669 the same as OUTFILE. If found, merge th
2752 merge (struct sortfile *files, size_t ntemps, size_t nfiles, function
[all...]

Completed in 226 milliseconds

12