Filename: //lib/git-core////mergetools/diffmerge

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { if $base_present then "$merge_tool_path" --merge --result="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi } exit_code_trustable () { true }

./Ninja\.