Home
last modified time | relevance | path

Searched refs:merge_hunk (Results 1 – 12 of 12) sorted by relevance

/dports/devel/patch/patch-2.7.6/src/
H A Dcommon.h219 bool merge_hunk (int hunk, struct outstate *, lin where, bool *);
221 # define merge_hunk(hunk, outstate, where, somefailed) false macro
H A Dcommon.h.orig217 bool merge_hunk (int hunk, struct outstate *, lin where, bool *);
219 # define merge_hunk(hunk, outstate, where, somefailed) false
H A Dmerge.c199 merge_hunk (int hunk, struct outstate *outstate, lin where, bool *somefailed) in merge_hunk() function
H A Dpatch.c476 || (merge && ! merge_hunk (hunk, &outstate, where, in main()
H A Dpatch.c.orig469 || (merge && ! merge_hunk (hunk, &outstate, where,
/dports/devel/git-svn/git-2.34.1/
H A Dgit-add--interactive.perl917 sub merge_hunk { subroutine
1011 merge_hunk($out[-1], $_);
/dports/devel/git-gui/git-2.34.1/
H A Dgit-add--interactive.perl917 sub merge_hunk { subroutine
1011 merge_hunk($out[-1], $_);
/dports/devel/git-p4/git-2.34.1/
H A Dgit-add--interactive.perl917 sub merge_hunk { subroutine
1011 merge_hunk($out[-1], $_);
/dports/devel/git/git-2.34.1/
H A Dgit-add--interactive.perl917 sub merge_hunk { subroutine
1011 merge_hunk($out[-1], $_);
/dports/devel/git-cvs/git-2.34.1/
H A Dgit-add--interactive.perl917 sub merge_hunk { subroutine
1011 merge_hunk($out[-1], $_);
/dports/devel/cgit/cgit-1.2.3/git/
H A Dgit-add--interactive.perl914 sub merge_hunk { subroutine
1008 merge_hunk($out[-1], $_);
/dports/devel/patch/patch-2.7.6/
H A DChangeLog-2011621 * src/merge.c (merge_hunk): Implement diff3-style conflicts.
816 * merge.c (merge_hunk): Add missing outstate->zero_output = false.
896 * merge.c (merge_hunk): Likewise.
922 (merge_hunk): Be silent when merging exact matches unless in
953 * common.h (merge_hunk): Declare function.
964 (merge_hunk): Replace simple guessing with locate_merge().
983 (merge_hunk): Merge the hunk with the compute_changes() result.
992 * merge.c (merge_hunk): Add two missing checks that were leading into