Merge branch 'es/doc-worktree-guessremote-config'
[git.git] / mergetools / diffmerge
blob9b6355b98a71da2627b68c6543cea4f2515b8d54
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" --merge --result="$MERGED" \
9                         "$LOCAL" "$BASE" "$REMOTE"
10         else
11                 "$merge_tool_path" --merge \
12                         --result="$MERGED" "$LOCAL" "$REMOTE"
13         fi
16 exit_code_trustable () {
17         true