Home
last modified time | relevance | path

Searched refs:merge_tool (Results 1 – 25 of 26) sorted by relevance

12

/dports/devel/cgit/cgit-1.2.3/git/
H A Dgit-mergetool--lib.sh207 merge_tool="$1"
211 git config "mergetool.$merge_tool.cmd"
213 git config "mergetool.$merge_tool.cmd"
376 merge_tool=$(
388 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
394 echo "$merge_tool"
399 merge_tool="$1"
400 if ! valid_tool "$merge_tool"
429 merge_tool=$(get_configured_merge_tool)
431 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 run_merge_tool "$merge_tool"
72 merge_tool="$GIT_DIFF_TOOL"
74 merge_tool="$(get_merge_tool)"
82 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh350 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
361 if ! run_merge_tool "$merge_tool" "$present"
426 merge_tool=${1#*=}
431 merge_tool="$2"
467 if test -z "$merge_tool"
469 if ! merge_tool=$(get_merge_tool)
/dports/devel/git-p4/git-2.34.1/
H A Dgit-mergetool--lib.sh235 merge_tool="$1"
239 git config "mergetool.$merge_tool.cmd"
241 git config "mergetool.$merge_tool.cmd"
408 merge_tool=$(
420 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
426 echo "$merge_tool"
431 merge_tool="$1"
432 if ! valid_tool "$merge_tool"
461 merge_tool=$(get_configured_merge_tool)
463 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 initialize_merge_tool "$merge_tool"
67 run_merge_tool "$merge_tool"
75 merge_tool="$GIT_DIFF_TOOL"
77 merge_tool="$(get_merge_tool)"
85 initialize_merge_tool "$merge_tool"
88 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh275 initialize_merge_tool "$merge_tool" || return
338 tool_config="mergetool.${merge_tool}.hideResolved"
395 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
406 if ! run_merge_tool "$merge_tool" "$present"
471 merge_tool=${1#*=}
476 merge_tool="$2"
512 if test -z "$merge_tool"
514 if ! merge_tool=$(get_merge_tool)
/dports/devel/git-svn/git-2.34.1/
H A Dgit-mergetool--lib.sh235 merge_tool="$1"
239 git config "mergetool.$merge_tool.cmd"
241 git config "mergetool.$merge_tool.cmd"
408 merge_tool=$(
420 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
426 echo "$merge_tool"
431 merge_tool="$1"
432 if ! valid_tool "$merge_tool"
461 merge_tool=$(get_configured_merge_tool)
463 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 initialize_merge_tool "$merge_tool"
67 run_merge_tool "$merge_tool"
75 merge_tool="$GIT_DIFF_TOOL"
77 merge_tool="$(get_merge_tool)"
85 initialize_merge_tool "$merge_tool"
88 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh275 initialize_merge_tool "$merge_tool" || return
338 tool_config="mergetool.${merge_tool}.hideResolved"
395 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
406 if ! run_merge_tool "$merge_tool" "$present"
471 merge_tool=${1#*=}
476 merge_tool="$2"
512 if test -z "$merge_tool"
514 if ! merge_tool=$(get_merge_tool)
/dports/devel/git-gui/git-2.34.1/
H A Dgit-mergetool--lib.sh235 merge_tool="$1"
239 git config "mergetool.$merge_tool.cmd"
241 git config "mergetool.$merge_tool.cmd"
408 merge_tool=$(
420 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
426 echo "$merge_tool"
431 merge_tool="$1"
432 if ! valid_tool "$merge_tool"
461 merge_tool=$(get_configured_merge_tool)
463 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 initialize_merge_tool "$merge_tool"
67 run_merge_tool "$merge_tool"
75 merge_tool="$GIT_DIFF_TOOL"
77 merge_tool="$(get_merge_tool)"
85 initialize_merge_tool "$merge_tool"
88 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh275 initialize_merge_tool "$merge_tool" || return
338 tool_config="mergetool.${merge_tool}.hideResolved"
395 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
406 if ! run_merge_tool "$merge_tool" "$present"
471 merge_tool=${1#*=}
476 merge_tool="$2"
512 if test -z "$merge_tool"
514 if ! merge_tool=$(get_merge_tool)
/dports/devel/git/git-2.34.1/
H A Dgit-mergetool--lib.sh235 merge_tool="$1"
239 git config "mergetool.$merge_tool.cmd"
241 git config "mergetool.$merge_tool.cmd"
408 merge_tool=$(
420 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
426 echo "$merge_tool"
431 merge_tool="$1"
432 if ! valid_tool "$merge_tool"
461 merge_tool=$(get_configured_merge_tool)
463 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 initialize_merge_tool "$merge_tool"
67 run_merge_tool "$merge_tool"
75 merge_tool="$GIT_DIFF_TOOL"
77 merge_tool="$(get_merge_tool)"
85 initialize_merge_tool "$merge_tool"
88 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh275 initialize_merge_tool "$merge_tool" || return
338 tool_config="mergetool.${merge_tool}.hideResolved"
395 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
406 if ! run_merge_tool "$merge_tool" "$present"
471 merge_tool=${1#*=}
476 merge_tool="$2"
512 if test -z "$merge_tool"
514 if ! merge_tool=$(get_merge_tool)
/dports/devel/git-cvs/git-2.34.1/
H A Dgit-mergetool--lib.sh235 merge_tool="$1"
239 git config "mergetool.$merge_tool.cmd"
241 git config "mergetool.$merge_tool.cmd"
408 merge_tool=$(
420 if test -n "$merge_tool" && ! valid_tool "$merge_tool"
426 echo "$merge_tool"
431 merge_tool="$1"
432 if ! valid_tool "$merge_tool"
461 merge_tool=$(get_configured_merge_tool)
463 if test -z "$merge_tool"
[all …]
H A Dgit-difftool--helper.sh50 printf "Launch '%s' [Y/n]? " "$merge_tool"
64 initialize_merge_tool "$merge_tool"
67 run_merge_tool "$merge_tool"
75 merge_tool="$GIT_DIFF_TOOL"
77 merge_tool="$(get_merge_tool)"
85 initialize_merge_tool "$merge_tool"
88 run_merge_tool "$merge_tool" false
H A Dgit-mergetool.sh275 initialize_merge_tool "$merge_tool" || return
338 tool_config="mergetool.${merge_tool}.hideResolved"
395 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
406 if ! run_merge_tool "$merge_tool" "$present"
471 merge_tool=${1#*=}
476 merge_tool="$2"
512 if test -z "$merge_tool"
514 if ! merge_tool=$(get_merge_tool)
/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dutil.c116 char *merge_tool; in svn_cl__merge_file_externally() local
118 if (apr_env_get(&merge_tool, "SVN_MERGE", pool) != APR_SUCCESS) in svn_cl__merge_file_externally()
121 merge_tool = NULL; in svn_cl__merge_file_externally()
124 svn_config_get(cfg, (const char **)&merge_tool, in svn_cl__merge_file_externally()
129 if (merge_tool) in svn_cl__merge_file_externally()
133 for (c = merge_tool; *c; c++) in svn_cl__merge_file_externally()
158 arguments[0] = merge_tool; in svn_cl__merge_file_externally()
168 SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, in svn_cl__merge_file_externally()
178 merge_tool, exitcode); in svn_cl__merge_file_externally()
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dutil.c116 char *merge_tool; in svn_cl__merge_file_externally() local
118 if (apr_env_get(&merge_tool, "SVN_MERGE", pool) != APR_SUCCESS) in svn_cl__merge_file_externally()
121 merge_tool = NULL; in svn_cl__merge_file_externally()
124 svn_config_get(cfg, (const char **)&merge_tool, in svn_cl__merge_file_externally()
129 if (merge_tool) in svn_cl__merge_file_externally()
133 for (c = merge_tool; *c; c++) in svn_cl__merge_file_externally()
158 arguments[0] = merge_tool; in svn_cl__merge_file_externally()
168 SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, in svn_cl__merge_file_externally()
178 merge_tool, exitcode); in svn_cl__merge_file_externally()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dutil.c116 char *merge_tool; in svn_cl__merge_file_externally() local
118 if (apr_env_get(&merge_tool, "SVN_MERGE", pool) != APR_SUCCESS) in svn_cl__merge_file_externally()
121 merge_tool = NULL; in svn_cl__merge_file_externally()
124 svn_config_get(cfg, (const char **)&merge_tool, in svn_cl__merge_file_externally()
129 if (merge_tool) in svn_cl__merge_file_externally()
133 for (c = merge_tool; *c; c++) in svn_cl__merge_file_externally()
158 arguments[0] = merge_tool; in svn_cl__merge_file_externally()
168 SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, in svn_cl__merge_file_externally()
178 merge_tool, exitcode); in svn_cl__merge_file_externally()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dutil.c116 char *merge_tool; in svn_cl__merge_file_externally() local
118 if (apr_env_get(&merge_tool, "SVN_MERGE", pool) != APR_SUCCESS) in svn_cl__merge_file_externally()
121 merge_tool = NULL; in svn_cl__merge_file_externally()
124 svn_config_get(cfg, (const char **)&merge_tool, in svn_cl__merge_file_externally()
129 if (merge_tool) in svn_cl__merge_file_externally()
133 for (c = merge_tool; *c; c++) in svn_cl__merge_file_externally()
158 arguments[0] = merge_tool; in svn_cl__merge_file_externally()
168 SVN_ERR(svn_io_run_cmd(svn_dirent_internal_style(cwd, pool), merge_tool, in svn_cl__merge_file_externally()
178 merge_tool, exitcode); in svn_cl__merge_file_externally()
/dports/graphics/py-rasterio/rasterio-1.2.10/rasterio/rio/
H A Dmerge.py53 from rasterio.merge import merge as merge_tool unknown
61 merge_tool(
/dports/science/InsightToolkit/ITK-5.0.1/Utilities/Hooks/
H A Dpre-commit-style.bash199 ! run_merge_tool "$merge_tool" "false" $console; then
242 merge_tool=$(get_merge_tool "$merge_tool") || die "Merge tool not configured.
/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/
H A D__main__.py85 from nbdime.vcs.git.mergetool import main as merge_tool unknown
92 merge_tool(args)

12